diff --git a/src/common/console.css b/src/common/console.css
index 72732f3..2eba28f 100644
--- a/src/common/console.css
+++ b/src/common/console.css
@@ -148,3 +148,12 @@
 .TWPT-log-entry.TWPT-log-entry--error {
   color: #ff1744;
 }
+
+/*
+ * Fix for the headers' right controls so the dark theme switch has space and
+ * doesn't overlap the search bar.
+ **/
+.material-content > header .right-control {
+  width: auto!important;
+  max-width: 252px!important;
+}
diff --git a/src/injections/ccdarktheme.css b/src/injections/ccdarktheme.css
index e256297..c87f968 100644
--- a/src/injections/ccdarktheme.css
+++ b/src/injections/ccdarktheme.css
@@ -56,11 +56,6 @@
   color: rgba(255, 255, 255, .87)!important;
 }
 
-.material-content > header .right-control {
-  width: auto!important;
-  max-width: 252px!important;
-}
-
 .material-content > header .bell.mixin {
   fill: rgba(255, 255, 255, .87)!important;
 }