diff --git a/scripts/system/create/edit.js b/scripts/system/create/edit.js
index 47246705f9..e56d59b234 100644
--- a/scripts/system/create/edit.js
+++ b/scripts/system/create/edit.js
@@ -578,14 +578,10 @@ var toolBar = (function () {
             var isLoadedCheckCount = 0;
             var entityIsLoadedCheck = function() {
                 isLoadedCheckCount++;
-                if (isLoadedCheckCount === MAX_LOADED_CHECKS) {
+                if (isLoadedCheckCount === MAX_LOADED_CHECKS || Entity.isLoaded(entityID)) {
                     return;
                 }
-                if (EntityisLoaded(entityID)) {
-                    return;
-                } else {
-                    Script.setTimeout(entityIsLoadedCheck, LOADED_CHECK_INTERVAL);
-                }
+                Script.setTimeout(entityIsLoadedCheck, LOADED_CHECK_INTERVAL);
             }
             Script.setTimeout(entityIsLoadedCheck, LOADED_CHECK_INTERVAL);