diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 222934d915..29d260cb5f 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -4984,9 +4984,9 @@ void Application::idle() {
 
     {
         if (_keyboardFocusWaitingOnRenderable && getEntities()->renderableForEntityId(_keyboardFocusedEntity.get())) {
-            _keyboardFocusWaitingOnRenderable = false;
             QUuid entityId = _keyboardFocusedEntity.get();
             setKeyboardFocusEntity(UNKNOWN_ENTITY_ID);
+            _keyboardFocusWaitingOnRenderable = false;
             setKeyboardFocusEntity(entityId);
         }
     }