diff --git a/js/pmd/designer_page.js b/js/pmd/designer_page.js
index 0622346ba5..d4dff78dcf 100644
--- a/js/pmd/designer_page.js
+++ b/js/pmd/designer_page.js
@@ -105,6 +105,7 @@ function Show_new_page_tables(check)
     }
     selected_page = -1;
     $("#top_menu #page_name").text(PMA_messages.strUntitled);
+    MarkUnsaved();
 }
 
 function Load_HTML_for_page(page_id)
@@ -112,6 +113,7 @@ function Load_HTML_for_page(page_id)
     Show_new_page_tables(false);
     Load_page_objects(page_id, function (page, tbl_cords) {
         $("#top_menu #page_name").text(page.page_descr);
+        MarkSaved();
         for (var t in tbl_cords) {
             var tb_id = db + '.' + tbl_cords[t].table_name;
             var table = document.getElementById(tb_id);
diff --git a/libraries/db_designer.lib.php b/libraries/db_designer.lib.php
index 863531dea1..15b59ad2cb 100644
--- a/libraries/db_designer.lib.php
+++ b/libraries/db_designer.lib.php
@@ -371,9 +371,10 @@ function PMA_getDesignerPageTopMenu($selected_page)
     $html .= '<img class="M_bord" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png') . '" />';
     $html .= '<span id="page_name" style="border:none;">';
-    $html .= htmlspecialchars($selected_page);
+    $html .= ($selected_page == null ? __("Untitled") : htmlspecialchars($selected_page));
     $html .= '</span>';
-    $html .= '<span id="saved_state" style="border:none;width:5px"></span>';
+    $html .= '<span id="saved_state" style="border:none;width:5px">';
+    $html .= ($selected_page == null ? '*' : '') . '</span>';
     $html .= '<img class="M_bord" alt="" ';
     $html .= 'src="' . $_SESSION['PMA_Theme']->getImgPath('pmd/bord.png') . '" />';
 
diff --git a/libraries/pmd_common.php b/libraries/pmd_common.php
index 858eccfca3..5552ab8d80 100644
--- a/libraries/pmd_common.php
+++ b/libraries/pmd_common.php
@@ -296,7 +296,7 @@ function PMA_getPageName($pg)
         $GLOBALS['controllink'],
         PMA_DatabaseInterface::QUERY_STORE
     );
-    return count($page_name) ? $page_name[0] : __("Untitled");
+    return count($page_name) ? $page_name[0] : null;
 }
 
 /**