diff --git a/menus/buffers-menu.ui b/menus/buffers-menu.ui
index 344087f4a2..0e793d4802 100644
--- a/menus/buffers-menu.ui
+++ b/menus/buffers-menu.ui
@@ -2,15 +2,19 @@
 
 <interface>
   <menu id="/buffers-popup">
-    <section>
-      <item><attribute name="action">buffers.buffers-paste</attribute></item>
-      <item><attribute name="action">buffers.buffers-paste-in-place</attribute></item>
-      <item><attribute name="action">buffers.buffers-paste-into</attribute></item>
-      <item><attribute name="action">buffers.buffers-paste-into-in-place</attribute></item>
-      <item><attribute name="action">buffers.buffers-paste-as-new-layer</attribute></item>
-      <item><attribute name="action">buffers.buffers-paste-as-new-layer-in-place</attribute></item>
-      <item><attribute name="action">buffers.buffers-paste-as-new-image</attribute></item>
-      <item><attribute name="action">buffers.buffers-delete</attribute></item>
-    </section>
+    <submenu>
+      <attribute name="label" translatable="yes" context="buffers-action">Buffers Menu</attribute>
+
+      <section>
+        <item><attribute name="action">buffers.buffers-paste</attribute></item>
+        <item><attribute name="action">buffers.buffers-paste-in-place</attribute></item>
+        <item><attribute name="action">buffers.buffers-paste-into</attribute></item>
+        <item><attribute name="action">buffers.buffers-paste-into-in-place</attribute></item>
+        <item><attribute name="action">buffers.buffers-paste-as-new-layer</attribute></item>
+        <item><attribute name="action">buffers.buffers-paste-as-new-layer-in-place</attribute></item>
+        <item><attribute name="action">buffers.buffers-paste-as-new-image</attribute></item>
+        <item><attribute name="action">buffers.buffers-delete</attribute></item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/menus/colormap-menu.ui b/menus/colormap-menu.ui
index 190c5611a9..faea81ca9e 100644
--- a/menus/colormap-menu.ui
+++ b/menus/colormap-menu.ui
@@ -2,15 +2,19 @@
 
 <interface>
   <menu id="/colormap-popup">
-    <item><attribute name="action">colormap.colormap-edit-color</attribute></item>
-    <item><attribute name="action">colormap.colormap-delete-color</attribute></item>
-    <item><attribute name="action">colormap.colormap-add-color-from-fg</attribute></item>
-    <item><attribute name="action">colormap.colormap-add-color-from-bg</attribute></item>
-    <section>
-      <item><attribute name="action">colormap.colormap-selection-replace</attribute></item>
-      <item><attribute name="action">colormap.colormap-selection-add</attribute></item>
-      <item><attribute name="action">colormap.colormap-selection-subtract</attribute></item>
-      <item><attribute name="action">colormap.colormap-selection-intersect</attribute></item>
-    </section>
+    <submenu>
+      <attribute name="label" translatable="yes" context="colormap-action">Colormap Menu</attribute>
+
+      <item><attribute name="action">colormap.colormap-edit-color</attribute></item>
+      <item><attribute name="action">colormap.colormap-delete-color</attribute></item>
+      <item><attribute name="action">colormap.colormap-add-color-from-fg</attribute></item>
+      <item><attribute name="action">colormap.colormap-add-color-from-bg</attribute></item>
+      <section>
+        <item><attribute name="action">colormap.colormap-selection-replace</attribute></item>
+        <item><attribute name="action">colormap.colormap-selection-add</attribute></item>
+        <item><attribute name="action">colormap.colormap-selection-subtract</attribute></item>
+        <item><attribute name="action">colormap.colormap-selection-intersect</attribute></item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/menus/documents-menu.ui b/menus/documents-menu.ui
index 9108d9d3f3..e284af7228 100644
--- a/menus/documents-menu.ui
+++ b/menus/documents-menu.ui
@@ -2,17 +2,21 @@
 
 <interface>
   <menu id="/documents-popup">
-    <item><attribute name="action">documents.documents-open</attribute></item>
-    <item><attribute name="action">documents.documents-raise-or-open</attribute></item>
-    <item><attribute name="action">documents.documents-file-open-dialog</attribute></item>
-    <item><attribute name="action">documents.documents-copy-location</attribute></item>
-    <item><attribute name="action">documents.documents-show-in-file-manager</attribute></item>
-    <item><attribute name="action">documents.documents-remove</attribute></item>
-    <item><attribute name="action">documents.documents-clear</attribute></item>
-    <section>
-      <item><attribute name="action">documents.documents-recreate-preview</attribute></item>
-      <item><attribute name="action">documents.documents-reload-previews</attribute></item>
-      <item><attribute name="action">documents.documents-remove-dangling</attribute></item>
-    </section>
+    <submenu>
+      <attribute name="label" translatable="yes" context="documents-action">Documents Menu</attribute>
+
+      <item><attribute name="action">documents.documents-open</attribute></item>
+      <item><attribute name="action">documents.documents-raise-or-open</attribute></item>
+      <item><attribute name="action">documents.documents-file-open-dialog</attribute></item>
+      <item><attribute name="action">documents.documents-copy-location</attribute></item>
+      <item><attribute name="action">documents.documents-show-in-file-manager</attribute></item>
+      <item><attribute name="action">documents.documents-remove</attribute></item>
+      <item><attribute name="action">documents.documents-clear</attribute></item>
+      <section>
+        <item><attribute name="action">documents.documents-recreate-preview</attribute></item>
+        <item><attribute name="action">documents.documents-reload-previews</attribute></item>
+        <item><attribute name="action">documents.documents-remove-dangling</attribute></item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/menus/error-console-menu.ui b/menus/error-console-menu.ui
index 953aee7480..4de036142e 100644
--- a/menus/error-console-menu.ui
+++ b/menus/error-console-menu.ui
@@ -2,17 +2,21 @@
 
 <interface>
   <menu id="/error-console-popup">
-    <item><attribute name="action">error-console.error-console-clear</attribute></item>
-    <item><attribute name="action">error-console.error-console-select-all</attribute></item>
-    <section>
-      <item><attribute name="action">error-console.error-console-save-all</attribute></item>
-      <item><attribute name="action">error-console.error-console-save-selection</attribute></item>
-    </section>
     <submenu>
-      <attribute name="label" translatable="yes" context="error-console-action">_Highlight</attribute>
-      <item><attribute name="action">error-console.error-console-highlight-error</attribute></item>
-      <item><attribute name="action">error-console.error-console-highlight-warning</attribute></item>
-      <item><attribute name="action">error-console.error-console-highlight-info</attribute></item>
+      <attribute name="label" translatable="yes" context="error-console-action">Error Console Menu</attribute>
+
+      <item><attribute name="action">error-console.error-console-clear</attribute></item>
+      <item><attribute name="action">error-console.error-console-select-all</attribute></item>
+      <section>
+        <item><attribute name="action">error-console.error-console-save-all</attribute></item>
+        <item><attribute name="action">error-console.error-console-save-selection</attribute></item>
+      </section>
+      <submenu>
+        <attribute name="label" translatable="yes" context="error-console-action">_Highlight</attribute>
+        <item><attribute name="action">error-console.error-console-highlight-error</attribute></item>
+        <item><attribute name="action">error-console.error-console-highlight-warning</attribute></item>
+        <item><attribute name="action">error-console.error-console-highlight-info</attribute></item>
+      </submenu>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/fonts-menu.ui b/menus/fonts-menu.ui
index 3b58ccbc1f..1cfed3e560 100644
--- a/menus/fonts-menu.ui
+++ b/menus/fonts-menu.ui
@@ -2,8 +2,12 @@
 
 <interface>
   <menu id="/fonts-popup">
-    <section>
-      <item><attribute name="action">fonts.fonts-refresh</attribute></item>
-    </section>
+    <submenu>
+      <attribute name="label" translatable="yes" context="fonts-action">Fonts Menu</attribute>
+
+      <section>
+        <item><attribute name="action">fonts.fonts-refresh</attribute></item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/menus/images-menu.ui b/menus/images-menu.ui
index 8206d8eff8..53ffae7549 100644
--- a/menus/images-menu.ui
+++ b/menus/images-menu.ui
@@ -2,8 +2,12 @@
 
 <interface>
   <menu id="/images-popup">
-    <item><attribute name="action">images.images-raise-views</attribute></item>
-    <item><attribute name="action">images.images-new-view</attribute></item>
-    <item><attribute name="action">images.images-delete</attribute></item>
+    <submenu>
+      <attribute name="label" translatable="yes" context="images-action">Images Menu</attribute>
+
+      <item><attribute name="action">images.images-raise-views</attribute></item>
+      <item><attribute name="action">images.images-new-view</attribute></item>
+      <item><attribute name="action">images.images-delete</attribute></item>
+    </submenu>
   </menu>
 </interface>
diff --git a/menus/mypaint-brushes-menu.ui b/menus/mypaint-brushes-menu.ui
index f8397176ef..75a66be19f 100644
--- a/menus/mypaint-brushes-menu.ui
+++ b/menus/mypaint-brushes-menu.ui
@@ -2,11 +2,15 @@
 
 <interface>
   <menu id="/mypaint-brushes-popup">
-    <item><attribute name="action">mypaint-brushes.mypaint-brushes-copy-location</attribute></item>
-    <item><attribute name="action">mypaint-brushes.mypaint-brushes-show-in-file-manager</attribute></item>
-    <item><attribute name="action">mypaint-brushes.mypaint-brushes-delete</attribute></item>
-    <section>
-      <item><attribute name="action">mypaint-brushes.mypaint-brushes-refresh</attribute></item>
-    </section>
+    <submenu>
+      <attribute name="label" translatable="yes" context="mypaint-brushes-action">MyPaint Brushes Menu</attribute>
+
+      <item><attribute name="action">mypaint-brushes.mypaint-brushes-copy-location</attribute></item>
+      <item><attribute name="action">mypaint-brushes.mypaint-brushes-show-in-file-manager</attribute></item>
+      <item><attribute name="action">mypaint-brushes.mypaint-brushes-delete</attribute></item>
+      <section>
+        <item><attribute name="action">mypaint-brushes.mypaint-brushes-refresh</attribute></item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/menus/palettes-menu.ui b/menus/palettes-menu.ui
index 526d23b0ce..e8113f588f 100644
--- a/menus/palettes-menu.ui
+++ b/menus/palettes-menu.ui
@@ -19,9 +19,9 @@
       <section>
         <item><attribute name="action">palettes.palettes-refresh</attribute></item>
       </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes" context="palettes-action">Export as</attribute>
+      <submenu>
+        <attribute name="label" translatable="yes" context="palettes-action">Export as</attribute>
+      </submenu>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/patterns-menu.ui b/menus/patterns-menu.ui
index dce4e9f8e3..b5eeb3dde7 100644
--- a/menus/patterns-menu.ui
+++ b/menus/patterns-menu.ui
@@ -2,21 +2,25 @@
 
 <interface>
   <menu id="/patterns-popup">
-    <item><attribute name="action">patterns.patterns-open-as-image</attribute></item>
+    <submenu>
+      <attribute name="label" translatable="yes" context="patterns-action">Patterns Menu</attribute>
 
-    <!-- disabled because they are useless now
-    <item><attribute name="action">patterns.patterns-edit</attribute></item>
-    <section>
-      <item><attribute name="action">patterns.patterns-new</attribute></item>
-      <item><attribute name="action">patterns.patterns-duplicate</attribute></item>
-    </section>
-    -->
+      <item><attribute name="action">patterns.patterns-open-as-image</attribute></item>
 
-    <item><attribute name="action">patterns.patterns-copy-location</attribute></item>
-    <item><attribute name="action">patterns.patterns-show-in-file-manager</attribute></item>
-    <item><attribute name="action">patterns.patterns-delete</attribute></item>
-    <section>
-      <item><attribute name="action">patterns.patterns-refresh</attribute></item>
-    </section>
+      <!-- disabled because they are useless now
+      <item><attribute name="action">patterns.patterns-edit</attribute></item>
+      <section>
+        <item><attribute name="action">patterns.patterns-new</attribute></item>
+        <item><attribute name="action">patterns.patterns-duplicate</attribute></item>
+      </section>
+      -->
+
+      <item><attribute name="action">patterns.patterns-copy-location</attribute></item>
+      <item><attribute name="action">patterns.patterns-show-in-file-manager</attribute></item>
+      <item><attribute name="action">patterns.patterns-delete</attribute></item>
+      <section>
+        <item><attribute name="action">patterns.patterns-refresh</attribute></item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/menus/templates-menu.ui b/menus/templates-menu.ui
index 8910f63bd0..c08dc8481b 100644
--- a/menus/templates-menu.ui
+++ b/menus/templates-menu.ui
@@ -2,12 +2,16 @@
 
 <interface>
   <menu id="/templates-popup">
-    <item><attribute name="action">templates.templates-create-image</attribute></item>
-    <section>
-      <item><attribute name="action">templates.templates-new</attribute></item>
-      <item><attribute name="action">templates.templates-duplicate</attribute></item>
-      <item><attribute name="action">templates.templates-edit</attribute></item>
-      <item><attribute name="action">templates.templates-delete</attribute></item>
-    </section>
+    <submenu>
+      <attribute name="label" translatable="yes" context="templates-action">Templates Menu</attribute>
+
+      <item><attribute name="action">templates.templates-create-image</attribute></item>
+      <section>
+        <item><attribute name="action">templates.templates-new</attribute></item>
+        <item><attribute name="action">templates.templates-duplicate</attribute></item>
+        <item><attribute name="action">templates.templates-edit</attribute></item>
+        <item><attribute name="action">templates.templates-delete</attribute></item>
+      </section>
+    </submenu>
   </menu>
 </interface>
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index ef1a9bc7da..9b81676938 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -186,7 +186,7 @@ remap_create_procedure (GimpPlugIn  *plug_in,
       gimp_procedure_set_menu_label (procedure, _("R_earrange Colormap..."));
       gimp_procedure_set_icon_name (procedure, GIMP_ICON_COLORMAP);
       gimp_procedure_add_menu_path (procedure, "<Image>/Colors/Map/[Colormap]");
-      gimp_procedure_add_menu_path (procedure, "<Colormap>");
+      gimp_procedure_add_menu_path (procedure, "<Colormap>/Colormap Menu");
 
       gimp_procedure_set_documentation (procedure,
                                         _("Rearrange the colormap"),
diff --git a/plug-ins/python/gradients-save-as-css.py b/plug-ins/python/gradients-save-as-css.py
index d41819fc6c..c78221f38b 100755
--- a/plug-ins/python/gradients-save-as-css.py
+++ b/plug-ins/python/gradients-save-as-css.py
@@ -218,7 +218,7 @@ class GradientsSaveAsCSS (Gimp.PlugIn):
             procedure.set_attribution("Joao S. O. Bueno",
                                       "(c) GPL V3.0 or later",
                                       "2011")
-            procedure.add_menu_path('<Gradients>')
+            procedure.add_menu_path('<Gradients>/Gradients Menu')
 
             procedure.add_argument_from_property(self, "run-mode")
             procedure.add_argument_from_property(self, "gradient")
diff --git a/plug-ins/python/palette-offset.py b/plug-ins/python/palette-offset.py
index 0bb8dba087..a94fc0903e 100644
--- a/plug-ins/python/palette-offset.py
+++ b/plug-ins/python/palette-offset.py
@@ -102,7 +102,7 @@ class PaletteOffset (Gimp.PlugIn):
             procedure.add_argument_from_property(self, "palette")
             procedure.add_argument_from_property(self, "amount")
             procedure.add_return_value_from_property(self, "new-palette")
-            procedure.add_menu_path ('<Palettes>')
+            procedure.add_menu_path ('<Palettes>/Palettes Menu')
         else:
             procedure = None
 
diff --git a/plug-ins/python/palette-sort.py b/plug-ins/python/palette-sort.py
index 339241ea09..3574ad04f2 100755
--- a/plug-ins/python/palette-sort.py
+++ b/plug-ins/python/palette-sort.py
@@ -427,7 +427,7 @@ class PaletteSort (Gimp.PlugIn):
             procedure.set_attribution("João S. O. Bueno, Carol Spears, David Gowers",
                                       "João S. O. Bueno, Carol Spears, David Gowers",
                                       "2006-2014")
-            procedure.add_menu_path ('<Palettes>')
+            procedure.add_menu_path ('<Palettes>/Palettes Menu')
 
             procedure.add_argument_from_property(self, "run-mode")
             procedure.add_argument_from_property(self, "palette")
diff --git a/plug-ins/python/palette-to-gradient.py b/plug-ins/python/palette-to-gradient.py
index c140ad8847..4cb1fd56f0 100644
--- a/plug-ins/python/palette-to-gradient.py
+++ b/plug-ins/python/palette-to-gradient.py
@@ -183,7 +183,7 @@ class PaletteToGradient (Gimp.PlugIn):
             procedure.add_argument_from_property(self, "palette")
             procedure.add_return_value_from_property(self, "new-gradient")
 
-            procedure.add_menu_path ('<Palettes>')
+            procedure.add_menu_path ('<Palettes>/Palettes Menu')
 
         return procedure
 
diff --git a/plug-ins/script-fu/scripts/font-map.scm b/plug-ins/script-fu/scripts/font-map.scm
index fc918db2d7..00700db1d3 100644
--- a/plug-ins/script-fu/scripts/font-map.scm
+++ b/plug-ins/script-fu/scripts/font-map.scm
@@ -174,4 +174,4 @@
 )
 
 (script-fu-menu-register "script-fu-font-map"
-                         "<Fonts>")
+                         "<Fonts>/Fonts Menu")
diff --git a/plug-ins/script-fu/scripts/gradient-example.scm b/plug-ins/script-fu/scripts/gradient-example.scm
index d7638b26fd..4ed5f41240 100644
--- a/plug-ins/script-fu/scripts/gradient-example.scm
+++ b/plug-ins/script-fu/scripts/gradient-example.scm
@@ -78,4 +78,4 @@
 )
 
 (script-fu-menu-register "script-fu-gradient-example"
-                         "<Gradients>")
+                         "<Gradients>/Gradients Menu")
diff --git a/plug-ins/script-fu/scripts/mkbrush.scm b/plug-ins/script-fu/scripts/mkbrush.scm
index 84c970a25e..92fb2344ec 100644
--- a/plug-ins/script-fu/scripts/mkbrush.scm
+++ b/plug-ins/script-fu/scripts/mkbrush.scm
@@ -73,7 +73,7 @@
 )
 
 (script-fu-menu-register "script-fu-make-brush-rectangular"
-                         "<Brushes>")
+                         "<Brushes>/Brushes Menu")
 
 
 (define (script-fu-make-brush-rectangular-feathered name width height
@@ -144,7 +144,7 @@
 )
 
 (script-fu-menu-register "script-fu-make-brush-rectangular-feathered"
-                         "<Brushes>")
+                         "<Brushes>/Brushes Menu")
 
 
 (define (script-fu-make-brush-elliptical name width height spacing)
@@ -199,7 +199,7 @@
 )
 
 (script-fu-menu-register "script-fu-make-brush-elliptical"
-                         "<Brushes>")
+                         "<Brushes>/Brushes Menu")
 
 
 (define (script-fu-make-brush-elliptical-feathered name
@@ -269,4 +269,4 @@
 )
 
 (script-fu-menu-register "script-fu-make-brush-elliptical-feathered"
-                         "<Brushes>")
+                         "<Brushes>/Brushes Menu")
diff --git a/plug-ins/script-fu/scripts/palette-export.scm b/plug-ins/script-fu/scripts/palette-export.scm
index c73418a6e6..bc46c0ea5b 100644
--- a/plug-ins/script-fu/scripts/palette-export.scm
+++ b/plug-ins/script-fu/scripts/palette-export.scm
@@ -228,7 +228,7 @@
                       (string-append "palette." file-type)
                       )
   (script-fu-menu-register (string-append "gimp-palette-export-" export-type)
-                           "<Palettes>/Export as")
+                           "<Palettes>/Palettes Menu/Export as")
   )
 
 (define (bad-file-name)