diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 1c0b7c2dcb..4b8abff84b 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -392,6 +392,8 @@ var toolBar = (function () {
         entityListTool.sendUpdate();
         selectionManager.setSelections([entityID]);
 
+        Window.setFocus();
+
         return entityID;
     }