diff --git a/src/blocks/components/button-dropdown-control/editor.scss b/src/blocks/components/button-dropdown-control/editor.scss
index 2eff2c8da..bc1cfcf0b 100644
--- a/src/blocks/components/button-dropdown-control/editor.scss
+++ b/src/blocks/components/button-dropdown-control/editor.scss
@@ -49,7 +49,7 @@
     }
 }
 
-body:not( .branch-6-1 ) {
+body:is( [class*="branch-5-"], [class*="version-6-0"] ) {
     .o-button-dropdown-control-content {
         .components-popover__content {
             @media (min-width: 782px) {
diff --git a/src/blocks/components/color-dropdown-control/editor.scss b/src/blocks/components/color-dropdown-control/editor.scss
index 3ecb295e5..9edff1cbe 100644
--- a/src/blocks/components/color-dropdown-control/editor.scss
+++ b/src/blocks/components/color-dropdown-control/editor.scss
@@ -56,7 +56,7 @@
     }
 }
 
-body:not( .branch-6-1 ) {
+body:is( [class*="branch-5-"], [class*="version-6-0"] ) {
     .o-color-dropdown-control-content {
         .components-popover__content {
             @media (min-width: 782px) {