diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 20600a1cf..c64616c3f 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -249,9 +249,9 @@ stage {
 %osd_entry {
   @extend %entry_common;
   @include entry(normal, $c:$osd_fg_color,);
-  &:hover { @include entry(hover, $c:$osd_fg_color,);}
-  &:focus { @include entry(focus, $c:$osd_fg_color,);}
-  &:insensitive { @include entry(insensitive, $c:$osd_fg_color,);}
+  &:hover { @include entry(hover, $c:$osd_fg_color);}
+  &:focus { @include entry(focus, $c:$osd_fg_color);}
+  &:insensitive { @include entry(insensitive, $c:$osd_fg_color);}
 
   StLabel.hint-text {color: transparentize($osd_fg_color, 0.3); }
 }
@@ -279,13 +279,14 @@ stage {
 %system_entry {
   @extend %entry_common;
   @include entry(normal, $c:$system_fg_color,);
-  &:hover { @include entry(hover, $c:$system_fg_color,);}
-  &:focus { @include entry(focus, $c:$system_fg_color,);}
-  &:insensitive { @include entry(insensitive, $c:$system_fg_color,);}
+  &:hover { @include entry(hover, $c:$system_fg_color);}
+  &:focus { @include entry(focus, $c:$system_fg_color, $fc:transparentize($system_fg_color, 0.5));}
+  &:insensitive { @include entry(insensitive, $c:$system_fg_color);}
 
   StLabel.hint-text { color: transparentize($system_fg_color, 0.3);}
 }
 
+
 // buttons
 %system_button {
   @include button(normal, $tc:$system_fg_color, $c:$system_bg_color);
diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index 0e21551ac..cb77411c4 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -25,7 +25,7 @@
 
 
 // Text entries
-@mixin entry($t, $c) {
+@mixin entry($t, $c, $fc:$selected_bg_color) {
 //
 // Entries drawing function
 //
@@ -46,8 +46,8 @@
   }
 
   @if $t==focus {
-    background-color: mix(transparentize($c, 0.75), $selected_bg_color, 95%);
-    box-shadow: inset 0 0 0 2px transparentize($selected_bg_color, 0.3);
+    background-color: mix(transparentize($c, 0.75), $fc, 95%);
+    box-shadow: inset 0 0 0 2px transparentize($fc, 0.3);
     color: $c;
     &:hover {}
   }