diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index 74080dbe09..55bd11b286 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -1548,7 +1548,7 @@ var PropertiesTool = function (opts) {
         });
     }
 
-    selectionManager.addEventListener(function (selectionUpdated) {
+    function updateSelections(selectionUpdated) {
         var data = {
             type: 'update'
         };
@@ -1589,7 +1589,8 @@ var PropertiesTool = function (opts) {
         }
         data.selections = selections;
         webView.emitScriptEvent(JSON.stringify(data));
-    });
+    }
+    selectionManager.addEventListener(updateSelections);
 
     webView.webEventReceived.connect(function (data) {
         try {
@@ -1751,6 +1752,8 @@ var PropertiesTool = function (opts) {
                     }
                 }
             }
+        } else if (data.type === "propertiesPageReady") {
+            updateSelections(true);
         }
     });
 
diff --git a/scripts/system/html/js/entityProperties.js b/scripts/system/html/js/entityProperties.js
index 4f774e5305..2f109597d7 100644
--- a/scripts/system/html/js/entityProperties.js
+++ b/scripts/system/html/js/entityProperties.js
@@ -1704,4 +1704,8 @@ function loaded() {
     document.addEventListener("contextmenu", function(event) {
         event.preventDefault();
     }, false);
+
+    setTimeout(function() {
+        EventBridge.emitWebEvent(JSON.stringify({ type: 'propertiesPageReady' }));
+    }, 1000);
 }
diff --git a/scripts/system/tablet-ui/tabletUI.js b/scripts/system/tablet-ui/tabletUI.js
index 263c8822df..3b15eb4edb 100644
--- a/scripts/system/tablet-ui/tabletUI.js
+++ b/scripts/system/tablet-ui/tabletUI.js
@@ -75,8 +75,9 @@
     function showTabletUI() {
         tabletShown = true;
 
-        if (!tabletRezzed) {
-            rezTablet(false);
+        if (!tabletRezzed || !tabletIsValid()) {
+            closeTabletUI()
+            rezTablet();
         }
 
         if (UIWebTablet && tabletRezzed) {
@@ -199,7 +200,7 @@
                 preMakeTime = now;
                 if (!tabletIsValid()) {
                     closeTabletUI();
-                    rezTablet(false);
+                    rezTablet();
                     tabletShown = false;
                 } else if (!tabletShown) {
                     hideTabletUI();