diff --git a/js/src/designer/page.js b/js/src/designer/page.js
index 633fb5095d..a1c1220f46 100644
--- a/js/src/designer/page.js
+++ b/js/src/designer/page.js
@@ -128,13 +128,17 @@ DesignerPage.showNewPageTables = function (check) {
 };
 
 DesignerPage.loadHtmlForPage = function (pageId) {
-    DesignerPage.showNewPageTables(false);
+    DesignerPage.showNewPageTables(true);
     DesignerPage.loadPageObjects(pageId, function (page, tblCords) {
         $('#name-panel').find('#page_name').text(page.pageDescr);
-        DesignerMove.markSaved();
+        var tableMissing = false;
         for (var t = 0; t < tblCords.length; t++) {
             var tbId = db + '.' + tblCords[t].tableName;
             var table = document.getElementById(tbId);
+            if (table === null) {
+                tableMissing = true;
+                continue;
+            }
             table.style.top = tblCords[t].y + 'px';
             table.style.left = tblCords[t].x + 'px';
 
@@ -142,6 +146,11 @@ DesignerPage.loadHtmlForPage = function (pageId) {
             checkbox.checked = true;
             DesignerMove.visibleTab(checkbox, checkbox.value);
         }
+        DesignerMove.markSaved();
+        if (tableMissing === true) {
+            DesignerMove.markUnsaved();
+            Functions.ajaxShowMessage(Messages.strSavedPageTableMissing);
+        }
         selectedPage = page.pgNr;
     });
 };
diff --git a/libraries/classes/Controllers/JavaScriptMessagesController.php b/libraries/classes/Controllers/JavaScriptMessagesController.php
index 1eb3246448..45e19e9d29 100644
--- a/libraries/classes/Controllers/JavaScriptMessagesController.php
+++ b/libraries/classes/Controllers/JavaScriptMessagesController.php
@@ -538,6 +538,7 @@ final class JavaScriptMessagesController
             'strSavePageAs' => __('Save page as'),
             'strOpenPage' => __('Open page'),
             'strDeletePage' => __('Delete page'),
+            'strSavedPageTableMissing' => __('Some tables saved in this page might have been renamed or deleted.'),
             'strUntitled' => __('Untitled'),
             'strSelectPage' => __('Please select a page to continue'),
             'strEnterValidPageName' => __('Please enter a valid page name'),