diff --git a/pkg/lib/patternfly/patternfly-5-overrides.scss b/pkg/lib/patternfly/patternfly-5-overrides.scss
index 282af8922d45..9b6e7154f4d2 100644
--- a/pkg/lib/patternfly/patternfly-5-overrides.scss
+++ b/pkg/lib/patternfly/patternfly-5-overrides.scss
@@ -75,12 +75,6 @@ select.pf-v5-c-form-control {
   margin: 0;
 }
 
-// Fix the double-spacing issue for other dropdowns
-// https://github.com/patternfly/patternfly/issues/6632
-.pf-v5-c-menu-toggle__controls:last-child > .pf-v5-c-menu-toggle__toggle-icon {
-  margin-inline-end: 0;
-}
-
 // Fix menus cropping contents
 // https://github.com/patternfly/patternfly/issues/6565
 .pf-v5-c-menu__item-text {
diff --git a/pkg/shell/shell.scss b/pkg/shell/shell.scss
index afdf53c9b86a..eb980bb8386e 100644
--- a/pkg/shell/shell.scss
+++ b/pkg/shell/shell.scss
@@ -264,6 +264,12 @@ $desktop: $phone + 1px;
   --pf-v5-global--Color--100: var(--pf-v5-global--Color--dark-100);
 }
 
+// The normal margin to the right of the select dropdown makes them look uncentered in the masthead.
+// https://github.com/patternfly/patternfly/issues/6632
+.pf-v5-c-masthead .pf-v5-c-menu-toggle__controls:last-child > .pf-v5-c-menu-toggle__toggle-icon {
+  margin-inline-end: 0;
+}
+
 // Customize the about screen with the Cockpit logo
 .pf-v5-c-about-modal-box {
   --pf-v5-c-about-modal-box--BackgroundImage: linear-gradient(#000d, #000d), url(../shell/images/cockpit-icon.svg);