diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index bb5528e427..fcef0f0f50 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4168,6 +4168,8 @@ void Application::setKeyboardFocusOverlay(unsigned int overlayID) {
                 auto size = overlay->getSize() * FOCUS_HIGHLIGHT_EXPANSION_FACTOR;
                 const float OVERLAY_DEPTH = 0.0105f;
                 setKeyboardFocusHighlight(overlay->getPosition(), overlay->getRotation(), glm::vec3(size.x, size.y, OVERLAY_DEPTH));
+            } else {
+                _keyboardFocusHighlight->setVisible(false);
             }
         }
     }