diff --git a/src/sass/gnome-shell/_widgets-47-0.scss b/src/sass/gnome-shell/_widgets-47-0.scss
index f317703a..f0867bf5 100644
--- a/src/sass/gnome-shell/_widgets-47-0.scss
+++ b/src/sass/gnome-shell/_widgets-47-0.scss
@@ -1,11 +1,8 @@
-$primary-text: $white;
 
 @if $gnome_version == 'new' and $colortype == 'system' {
   $primary:            -st-accent-color;
   $indicator:          -st-accent-color;
   $inverse-indicator:  -st-accent-color;
-} @else {
-  $primary-text:       on($primary);
 }
 
 @import 'common/a11y';
diff --git a/src/sass/gnome-shell/common/_buttons.scss b/src/sass/gnome-shell/common/_buttons.scss
index 4dc73ffa..61bb4a11 100644
--- a/src/sass/gnome-shell/common/_buttons.scss
+++ b/src/sass/gnome-shell/common/_buttons.scss
@@ -1,5 +1,13 @@
 /* Buttons */
 
+$primary-text: $white;
+
+@if $gnome_version == 'new' and $colortype == 'system' {
+  $primary-text: $white;
+} @else {
+  $primary-text: on($primary);
+}
+
 %button {
   @include button(normal);
   &:focus { @include button(focus); }