diff --git a/Products/zms/plugins/www/zmi.core.css b/Products/zms/plugins/www/zmi.core.css
index a7afac148..e7ae73e29 100644
--- a/Products/zms/plugins/www/zmi.core.css
+++ b/Products/zms/plugins/www/zmi.core.css
@@ -103,6 +103,7 @@ header.navbar-nav .navbar-brand .slogan {
 }
 header.navbar-nav ul.navbar-nav {
 	background: #354f67;
+	flex-wrap: nowrap;
 }
 /* Show Debug Mode: ZMS.debug=1 */
 header.zmsdebug .navbar-brand .slogan {
diff --git a/Products/zms/zpt/common/zmi_html_foot.zpt b/Products/zms/zpt/common/zmi_html_foot.zpt
index 755170450..0c5b7b3ca 100644
--- a/Products/zms/zpt/common/zmi_html_foot.zpt
+++ b/Products/zms/zpt/common/zmi_html_foot.zpt
@@ -1,5 +1,10 @@
 <!-- common/zmi_html_foot -->
-<tal:block tal:repeat="src python:list(request.get('ZMI_LIBS_JS',[]))">
-<script type="text/javascript" charset="UTF-8" tal:condition="src" tal:attributes="src src"></script>
-</tal:block>
+<script tal:repeat="src python:list(request.get('ZMI_LIBS_JS',[]))" type="text/javascript" charset="UTF-8" tal:attributes="src src"></script>
+<script tal:condition="python: '/manage_menu' not in request.get('URL','') and request.get('method','') == 'GET'">
+	// Helper for Bookmarkable URLs in case of Sitemap Menu Frameset
+	if (window.parent.frames.manage_menu != undefined) {
+		window.parent.history.replaceState('','Main', window.location.href);
+		// console.log('common.zmi_html_foot: executed history.replaceState()')
+	};
+</script>
 <!-- /common/zmi_html_foot -->
\ No newline at end of file