diff --git a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/src/main/resources/Menu/MenuMacro.xml b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/src/main/resources/Menu/MenuMacro.xml
index a4d720184d73..fd97728a1ae6 100644
--- a/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/src/main/resources/Menu/MenuMacro.xml
+++ b/xwiki-platform-core/xwiki-platform-menu/xwiki-platform-menu-ui/src/main/resources/Menu/MenuMacro.xml
@@ -853,10 +853,17 @@ require(['jquery','xwiki-l10n!menu-ui-translation-keys'], function($, l10n) {
               }
             }
             /* When in dropdown we also have a link, reset the duplicated padding */
-            & > span > a {
+            & > .xDropdown-header > span > a {
               padding: 0;
               display: inherit;
             }
+            /* Reposition the toggle when in a dropdown of fixed size
+              to avoid eating away at the bit of space we have for the text. */
+            & > .xDropdown-header > .xDropdown-header-toggle {
+              position: absolute;
+              right: 0;
+              top: 0;
+            }
           }
           /* Separator horizontal inside menu */
           &:empty {