diff --git a/examples/editEntities.js b/examples/editEntities.js
index 5c26fc0805..1c53c2beb4 100644
--- a/examples/editEntities.js
+++ b/examples/editEntities.js
@@ -60,6 +60,7 @@ selectionManager.addEventListener(function() {
         propertiesTool.setVisible(true);
         entityListTool.setVisible(true);
         gridTool.setVisible(true);
+        Window.setFocus();
         hasShownPropertiesTool = true;
     }
     if (!selectionManager.hasSelection()) {
diff --git a/interface/src/scripting/WindowScriptingInterface.cpp b/interface/src/scripting/WindowScriptingInterface.cpp
index cffa5f777f..90ddade472 100644
--- a/interface/src/scripting/WindowScriptingInterface.cpp
+++ b/interface/src/scripting/WindowScriptingInterface.cpp
@@ -44,6 +44,11 @@ QScriptValue WindowScriptingInterface::hasFocus() {
     return DependencyManager::get<GLCanvas>()->hasFocus();
 }
 
+void WindowScriptingInterface::setFocus() {
+    Application::getInstance()->getWindow()->activateWindow();
+    Application::getInstance()->getWindow()->setFocus();
+}
+
 void WindowScriptingInterface::setCursorVisible(bool visible) {
     Application::getInstance()->setCursorVisible(visible);
 }
diff --git a/interface/src/scripting/WindowScriptingInterface.h b/interface/src/scripting/WindowScriptingInterface.h
index 05411530df..79a23960c9 100644
--- a/interface/src/scripting/WindowScriptingInterface.h
+++ b/interface/src/scripting/WindowScriptingInterface.h
@@ -40,6 +40,7 @@ public slots:
     void setCursorPosition(int x, int y);
     void setCursorVisible(bool visible);
     QScriptValue hasFocus();
+    void setFocus();
     QScriptValue alert(const QString& message = "");
     QScriptValue confirm(const QString& message = "");
     QScriptValue form(const QString& title, QScriptValue array);