diff --git a/data/theme/gtk-styles.css b/data/theme/gtk-styles.css
index fc00d736..a7b07ef3 100644
--- a/data/theme/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -93,14 +93,7 @@ GcalEventWidget.color-light:backdrop {
     border-top-right-radius: 0px;
 }
 
-GcalSearchView > GtkViewport {
-  background-color: @theme_bg_color;
+.search-viewport {
+  background-color: @theme_base_color;
 }
 
-.search-list {
-  border-bottom: 0px;
-}
-
-.search-list > GtkListBoxRow {
-  border-bottom: solid 1px @borders;
-}
diff --git a/data/ui/search-view.ui b/data/ui/search-view.ui
index 729ac868..cfb86040 100644
--- a/data/ui/search-view.ui
+++ b/data/ui/search-view.ui
@@ -66,6 +66,9 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="shadow_type">none</property>
+                <style>
+                  <class name="search-viewport" />
+                </style>
                 <child>
                   <object class="GtkGrid" id="search_grid">
                     <property name="visible">True</property>