diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index 82d6ee9953..ab21c5776c 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -621,6 +621,10 @@ var toolBar = (function () {
                         dimensions: naturalDimensions
                     })
                     dimensionsCheckCallback();
+                    // We want to update the selection manager again since the script has moved on without us.
+                    selectionManager.clearSelections(this);
+                    entityListTool.sendUpdate();
+                    selectionManager.setSelections([entityID], this);
                     return;
                 }
                 Script.setTimeout(entityIsLoadedCheck, LOADED_CHECK_INTERVAL);