diff --git a/css/_atlaskit_overrides.scss b/css/_atlaskit_overrides.scss
index f1172512ee..a2c5917998 100644
--- a/css/_atlaskit_overrides.scss
+++ b/css/_atlaskit_overrides.scss
@@ -72,8 +72,10 @@
  * Keep overflow menu within screen vertical bounds and make it scrollable.
  */
  .toolbox-button-wth-dialog > div:nth-child(2) {
+    background: $menuBG;
     max-height: calc(100vh - #{$newToolbarSizeWithPadding} - 46px);
     margin-bottom: 4px;
+    padding: 0;
     overflow-y: auto;
 }
 
diff --git a/css/_toolbars.scss b/css/_toolbars.scss
index 4b4a6c01f0..abf6b0c89f 100644
--- a/css/_toolbars.scss
+++ b/css/_toolbars.scss
@@ -72,11 +72,6 @@
 
     .toolbox-button-wth-dialog {
         display: inline-block;
-
-        &> div {
-            padding: 0;
-            background: $menuBG;
-        }
     }
 }