diff --git a/data/ui/window.ui b/data/ui/window.ui
index a405c160..d2f72940 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -56,7 +56,6 @@
                       <object class="GtkToggleButton" id="search_list_button">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="active" bind-source="search_entry" bind-property="has-focus" bind-flags="bidirectional"/>
                         <child>
                           <object class="GtkImage" id="search_list_image">
                             <property name="visible">True</property>
diff --git a/src/gcal-window.c b/src/gcal-window.c
index c97604f7..09a39494 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -1341,8 +1341,10 @@ gcal_window_constructed (GObject *object)
 
   g_object_bind_property (GCAL_WINDOW (object), "active-date", priv->views[GCAL_WINDOW_VIEW_SEARCH], "active-date",
                           G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
-  g_object_bind_property (GTK_TOGGLE_BUTTON (priv->search_list_button), "active", priv->views[GCAL_WINDOW_VIEW_SEARCH],
+  g_object_bind_property (GTK_TOGGLE_BUTTON (priv->search_button), "active", priv->views[GCAL_WINDOW_VIEW_SEARCH],
                           "visible", G_BINDING_DEFAULT);
+  g_object_bind_property (priv->views[GCAL_WINDOW_VIEW_SEARCH], "visible",
+                          GTK_TOGGLE_BUTTON (priv->search_list_button), "active", G_BINDING_DEFAULT);
 
   /* signals connection/handling */
   /* HACK to ensure proper destroy of search-view widget */