diff --git a/data/theme/gnome-shell-sass/widgets/_search-entry.scss b/data/theme/gnome-shell-sass/widgets/_search-entry.scss
index 115b6935b..329dbc7cd 100644
--- a/data/theme/gnome-shell-sass/widgets/_search-entry.scss
+++ b/data/theme/gnome-shell-sass/widgets/_search-entry.scss
@@ -1,12 +1,13 @@
 // Search entry
 
 $search_entry_width: 320px;
+$search_entry_height: 36px;
 
 %search_entry,
 .search-entry {
   width: $search_entry_width;
-  padding: 7px 9px;
-  border-radius: 18px;
+  padding: $base_padding+1 $base_padding+3;
+  border-radius: $search_entry_height * 0.5; // half the height
   color: transparentize($fg_color,0.3);
   background-color: $bg_color;
   border-color: $borders_color;
@@ -18,10 +19,11 @@ $search_entry_width: 320px;
   }
 
   &:focus {
-    padding: 6px 8px; // 1px less to account for wider border
+    padding: $base_padding $base_padding+2; // 1px less to account for wider border
     border-width: 2px;
-    color: $fg_color;
+    border-style: solid;
     border-color: $selected_bg_color;
+    color: $fg_color;
     box-shadow: inset 0 1px 2px 1px rgba(0,0,0,0.2);
   }