diff --git a/application/basilisk/base/content/browser-menubar.inc b/application/basilisk/base/content/browser-menubar.inc
index 702c5ec340..04e4634ed0 100644
--- a/application/basilisk/base/content/browser-menubar.inc
+++ b/application/basilisk/base/content/browser-menubar.inc
@@ -5,7 +5,11 @@
 
        <menubar id="main-menubar"
                 onpopupshowing="if (event.target.parentNode.parentNode == this &amp;&amp;
+#ifdef MOZ_WIDGET_GTK
+                                    document.documentElement.getAttribute('shellshowingmenubar') != 'true')
+#else
                                     !('@mozilla.org/widget/nativemenuservice;1' in Cc))
+#endif
                                   this.setAttribute('openedwithkey',
                                                     event.target.parentNode.openedWithKey);"
                 style="border:0px;padding:0px;margin:0px;-moz-appearance:none">
diff --git a/application/basilisk/base/content/browser.js b/application/basilisk/base/content/browser.js
index 0e4d7978cf..7933b937d1 100644
--- a/application/basilisk/base/content/browser.js
+++ b/application/basilisk/base/content/browser.js
@@ -4698,6 +4698,10 @@ function getTogglableToolbars() {
   let toolbarNodes = Array.slice(gNavToolbox.childNodes);
   toolbarNodes = toolbarNodes.concat(gNavToolbox.externalToolbars);
   toolbarNodes = toolbarNodes.filter(node => node.getAttribute("toolbarname"));
+#ifdef MOZ_WIDGET_GTK
+  if (document.documentElement.getAttribute("shellshowingmenubar") == "true")
+    toolbarNodes = toolbarNodes.filter(node => node.id != "toolbar-menubar");
+#endif
   return toolbarNodes;
 }
 
diff --git a/application/basilisk/components/places/content/places.xul b/application/basilisk/components/places/content/places.xul
index 16c3385cbf..6d2cdf1712 100644
--- a/application/basilisk/components/places/content/places.xul
+++ b/application/basilisk/components/places/content/places.xul
@@ -156,8 +156,12 @@
 #ifdef XP_MACOSX
         <toolbarbutton type="menu" class="tabbable"
               onpopupshowing="document.getElementById('placeContent').focus()"
+#else
+#ifdef MOZ_WIDGET_GTK
+      <menubar id="placesMenu" _moz-menubarkeeplocal="true">
 #else
       <menubar id="placesMenu">
+#endif
         <menu accesskey="&organize.accesskey;" class="menu-iconic"
 #endif
               id="organizeButton" label="&organize.label;"