diff --git a/client/src/sass/include/_variables.scss b/client/src/sass/include/_variables.scss
index 3fe1f74a2..2b893a62b 100644
--- a/client/src/sass/include/_variables.scss
+++ b/client/src/sass/include/_variables.scss
@@ -175,10 +175,10 @@ $zindex: (
   popover         : 13000,
   tooltip         : 14000,
   loadbar         : 15000,
-  dropdown        : 17000,
-  help-popover    : 17000,
   privacymsg      : 17500,
   header          : 17500,
+  help-popover    : 17600,
+  dropdown        : 17600,
   modal           : 19000,
   hotkeys         : 19000,
   notification    : 20000
diff --git a/client/src/sass/z-index.scss b/client/src/sass/z-index.scss
index c2c44b851..d362af0dd 100644
--- a/client/src/sass/z-index.scss
+++ b/client/src/sass/z-index.scss
@@ -13,9 +13,9 @@ ngx-loading-bar {
   z-index: z(header) + 1 !important;
 }
 
-/* rules for dropdowns excepts when in button group, to avoid impacting the dropdown-toggle */
-.dropdown,
-.dropup {
+// Dropdown added to body, override default z-index
+body > .dropdown,
+body > .dropup {
   z-index: z(dropdown) !important;
 }