diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 167cff70f..f89f96f2a 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -344,7 +344,7 @@
     &:focus { @include button(focus, $tc:$fg, $c:$bg, $always_dark: $system);}
     &:hover { @include button(hover, $tc:$fg, $c:$bg, $always_dark: $system);}
     &:active { @include button(active, $tc:$fg, $c:$bg, $always_dark: $system);}
-    &:selected,
+    &:highlighted,&:selected,
     &:checked { @include button(checked, $tc:$fg, $c:$bg, $always_dark: $system);}
     &:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $always_dark: $system);}
   } @else {
@@ -352,18 +352,11 @@
     &:focus { @include button(focus, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
     &:hover { @include button(hover, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
     &:active { @include button(active, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
-    &:selected,
+    &:highlighted,&:selected,
     &:checked { @include button(checked, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
     &:insensitive { @include button(insensitive, $tc:$fg, $c:$bg, $style: flat, $always_dark: $system);}
   }
 
-
-  &:highlighted {
-    // brighter background color than other states
-    $bg: transparentize($fg, 0.8);
-    @include button(active, $tc:$fg, $c:$bg, $always_dark: $system);
-  }
-
   &:drop {
     background-color: transparentize($selected_bg_color, .8);
     box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, .2);
diff --git a/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss b/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
index 262347237..bf534b047 100644
--- a/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
+++ b/data/theme/gnome-shell-sass/widgets/_switcher-popup.scss
@@ -27,6 +27,17 @@ $switcher_radius: $modal_radius + $switcher_padding;
     @include tile_button($fg:$osd_fg_color, $bg:$osd_bg_color);
     // override %tile style so mouse doesn't steal focus
     &:hover {background: none;}
+
+    // brighter than normal selected style
+    &:selected {
+      background-color: transparentize($osd_fg_color, 0.8);
+    }
+
+    @if $contrast == 'high' {
+      &:selected {
+        background-color: transparentize($osd_fg_color, 0.7);
+      }
+    }
   }
 
   .separator {
diff --git a/js/ui/switcherPopup.js b/js/ui/switcherPopup.js
index fd99b8374..e9bf08065 100644
--- a/js/ui/switcherPopup.js
+++ b/js/ui/switcherPopup.js
@@ -494,9 +494,9 @@ export const SwitcherList = GObject.registerClass({
 
         if (this._items[index]) {
             if (justOutline)
-                this._items[index].add_style_pseudo_class('selected');
-            else
                 this._items[index].add_style_pseudo_class('highlighted');
+            else
+                this._items[index].add_style_pseudo_class('selected');
         }
 
         this._highlighted = index;