3 files changed, 20 insertions, 7 deletions

diff --git a/client/src/app/menu/menu.component.scss b/client/src/app/menu/menu.component.scss
index 407d79725..975604055 100644
--- a/client/src/app/menu/menu.component.scss
+++ b/client/src/app/menu/menu.component.scss
@@ -241,6 +241,10 @@ menu {
   }
 }
 
+.dropdown {
+  z-index: #{z('menu') + 1} !important;
+}
+
 .dropdown-menu {
   width: calc(100% + 40px);
 }
diff --git a/client/src/sass/bootstrap.scss b/client/src/sass/bootstrap.scss
index a3b60198c..58256a065 100644
--- a/client/src/sass/bootstrap.scss
+++ b/client/src/sass/bootstrap.scss
@@ -27,15 +27,24 @@ $icon-font-path: '~@neos21/bootstrap3-glyphicons/assets/fonts/';
 }
 
 /* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */
-.dropdown:not(.btn-group):not(.dropdown-root):not(.action-dropdown):not(.input-group-prepend):not(.column-toggle) {
+.dropdown {
   z-index: z(dropdown) !important;
+}
 
-  &.list-overflow-menu,
-  &.parent-entry {
-    z-index: z(header) - 1 !important;
-  }
+.list-overflow-menu,
+.parent-entry {
+  z-index: z(header) - 1 !important;
 }
 
+.btn-group,
+.dropdown-root,
+.action-dropdown,
+.input-group-prepend,
+.column-toggle {
+  z-index: inherit !important;
+}
+
+
 .dropdown-menu {
   z-index: z(dropdown) + 1 !important;
 
diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 130462b89..a7ad0f643 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -127,9 +127,9 @@ $zindex: (
   miniature    :    10,
   privacymsg   :    20,
   typeahead    :    30,
-  header       :  1000,
-  menu         : 11000,
   dropdown     : 12000,
+  header       : 12500,
+  menu         : 12600,
   popover      : 13000,
   tooltip      : 14000,
   loadbar      : 15000,