diff --git a/application/palemoon/base/content/browser-menubar.inc b/application/palemoon/base/content/browser-menubar.inc
index fc6bc7694..8651d07bf 100644
--- a/application/palemoon/base/content/browser-menubar.inc
+++ b/application/palemoon/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/palemoon/base/content/browser.css b/application/palemoon/base/content/browser.css
index a2970aefc..933f0e1cd 100644
--- a/application/palemoon/base/content/browser.css
+++ b/application/palemoon/base/content/browser.css
@@ -226,6 +226,10 @@ splitmenu {
 #appmenu-toolbar-button > .toolbarbutton-text {
   display: -moz-box;
 }
+
+window[shellshowingmenubar="true"] #appmenu-toolbar-button {
+  display: none;
+}
 %endif
 
 #appmenu_offlineModeRecovery:not([checked=true]) {
diff --git a/application/palemoon/base/content/browser.js b/application/palemoon/base/content/browser.js
index 01b58ba4a..c59dde7e7 100644
--- a/application/palemoon/base/content/browser.js
+++ b/application/palemoon/base/content/browser.js
@@ -4540,6 +4540,12 @@ function onViewToolbarsPopupShowing(aEvent, aInsertPoint) {
   toolbarNodes.push(document.getElementById("addon-bar"));
 
   for (let toolbar of toolbarNodes) {
+#ifdef MOZ_WIDGET_GTK
+    if (toolbar.id == "toolbar-menubar" &&
+        document.documentElement.getAttribute("shellshowingmenubar") == "true") {
+      continue;
+    }
+#endif
     let toolbarName = toolbar.getAttribute("toolbarname");
     if (toolbarName) {
       let menuItem = document.createElement("menuitem");
diff --git a/application/palemoon/components/places/content/places.xul b/application/palemoon/components/places/content/places.xul
index 92e8a70e9..fd7843e7f 100644
--- a/application/palemoon/components/places/content/places.xul
+++ b/application/palemoon/components/places/content/places.xul
@@ -153,8 +153,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;"