diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 90be8f18c6..fe790480f6 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -2038,10 +2038,16 @@ var PropertiesTool = function (opts) {
     };
 
     that.setVisible(false);
+    
+    function emitScriptEvent(data) {
+        var dataString = JSON.stringify(data);
+        webView.emitScriptEvent(dataString);
+        createToolsWindow.emitScriptEvent(dataString);
+    }
 
     function updateScriptStatus(info) {
         info.type = "server_script_status";
-        webView.emitScriptEvent(JSON.stringify(info));
+        emitScriptEvent(info);
     }
 
     function resetScriptStatus() {
@@ -2094,8 +2100,7 @@ var PropertiesTool = function (opts) {
         }
         data.selections = selections;
 
-        webView.emitScriptEvent(JSON.stringify(data));
-        createToolsWindow.emitScriptEvent(JSON.stringify(data));
+        emitScriptEvent(data);
     }
     selectionManager.addEventListener(updateSelections);
 
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index d2cea2d394..ac0bf6ff1e 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -36,6 +36,8 @@ var lastEntityID = null;
 
 var MATERIAL_PREFIX_STRING = "mat::";
 
+var PENDING_SCRIPT_STATUS = "[ Fetching status ]";
+
 function debugPrint(message) {
     EventBridge.emitWebEvent(
         JSON.stringify({
@@ -1671,7 +1673,7 @@ function loaded() {
         elServerScripts.addEventListener('change', createEmitTextPropertyUpdateFunction('serverScripts'));
         elServerScripts.addEventListener('change', function() {
             // invalidate the current status (so that same-same updates can still be observed visually)
-            elServerScriptStatus.innerText = '[' + elServerScriptStatus.innerText + ']';
+            elServerScriptStatus.innerText = PENDING_SCRIPT_STATUS;
         });
 
         elClearUserData.addEventListener("click", function() {
@@ -2145,7 +2147,7 @@ function loaded() {
         });
         elReloadServerScriptsButton.addEventListener("click", function() {
             // invalidate the current status (so that same-same updates can still be observed visually)
-            elServerScriptStatus.innerText = '[' + elServerScriptStatus.innerText + ']';
+            elServerScriptStatus.innerText = PENDING_SCRIPT_STATUS;
             EventBridge.emitWebEvent(JSON.stringify({
                 type: "action",
                 action: "reloadServerScripts"