diff --git a/data/theme/gtk-styles.css b/data/theme/gtk-styles.css
index 563bdb15..fc00d736 100644
--- a/data/theme/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -97,6 +97,10 @@ GcalSearchView > GtkViewport {
   background-color: @theme_bg_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 817569b8..b0fd4e5c 100644
--- a/data/ui/search-view.ui
+++ b/data/ui/search-view.ui
@@ -23,8 +23,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
-                <property name="vexpand">True</property>
+                <property name="vexpand">False</property>
+                <property name="valign">GTK_ALIGN_START</property>
                 <property name="label_xalign">0</property>
+                <style>
+                  <class name="search-list" />
+                </style>
                 <child>
                   <object class="GtkListBox" id="listbox">
                     <property name="visible">True</property>
diff --git a/src/gcal-search-view.c b/src/gcal-search-view.c
index 96dc61bb..1d531f91 100644
--- a/src/gcal-search-view.c
+++ b/src/gcal-search-view.c
@@ -401,7 +401,6 @@ gcal_search_view_constructed (GObject *object)
 
   /* listbox */
   gtk_list_box_set_sort_func (GTK_LIST_BOX (priv->listbox), (GtkListBoxSortFunc) sort_by_event, object, NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (priv->listbox), "search-list");
 
   gcal_manager_set_search_subscriber (
       priv->manager,