diff --git a/data/ui/window.ui b/data/ui/window.ui
index 13ecd1f8..7780fead 100644
--- a/data/ui/window.ui
+++ b/data/ui/window.ui
@@ -26,6 +26,7 @@
                 <property name="no_show_all">True</property>
                 <property name="hexpand">True</property>
                 <property name="show_close_button">True</property>
+		<property name="search-mode-enabled" bind-source="search_button" bind-property="active" bind-flags="bidirectional"/>
 		<signal name="notify::search-mode-enabled" handler="search_toggled" object="GcalWindow" swapped="no"/>
                 <child>
                   <object class="GtkGrid" id="search_entry_grid">
diff --git a/src/gcal-window.c b/src/gcal-window.c
index a89b1d22..22e10e82 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -1052,9 +1052,6 @@ gcal_window_constructed (GObject *object)
   /* search bar */
   gtk_search_bar_connect_entry (GTK_SEARCH_BAR (priv->search_bar),
                                 GTK_ENTRY (priv->search_entry));
-  g_object_bind_property (priv->search_button, "active",
-                          priv->search_bar, "search-mode-enabled",
-                          G_BINDING_BIDIRECTIONAL);
 
   priv->views[GCAL_WINDOW_VIEW_WEEK] =
     gcal_week_view_new (priv->manager);