diff --git a/src/gcal-search-popover.c b/src/gcal-search-popover.c
index 4eaa6e4c..f8d80354 100644
--- a/src/gcal-search-popover.c
+++ b/src/gcal-search-popover.c
@@ -63,11 +63,14 @@ struct _GcalSearchPopover
   /* flags */
   GcalTimeFormat      time_format;
   gboolean            subscribed;
+
+  GcalContext        *context;
 };
 
 enum
 {
   PROP_0,
+  PROP_CONTEXT,
   PROP_DATE,
   PROP_TIME_FORMAT,
 };
@@ -581,6 +584,10 @@ gcal_search_popover_set_property (GObject      *object,
 
   switch (property_id)
     {
+    case PROP_CONTEXT:
+      self->context = g_value_dup_object (value);
+      break;
+
     case PROP_DATE:
       g_clear_pointer (&self->date, g_free);
       self->date = g_value_dup_boxed (value);
@@ -606,6 +613,10 @@ gcal_search_popover_get_property (GObject    *object,
 
   switch (property_id)
     {
+    case PROP_CONTEXT:
+      g_value_set_object (value, self->context);
+      break;
+
     case PROP_DATE:
       g_value_set_boxed (value, self->date);
       break;
@@ -659,6 +670,21 @@ gcal_search_popover_class_init (GcalSearchPopoverClass *klass)
                                            G_TYPE_NONE, 1, ICAL_TIME_TYPE);
 
   /* properties */
+  /**
+   * GcalSearchPopover::context:
+   *
+   * The context
+   *
+   */
+  g_object_class_install_property (object_class,
+                                   PROP_CONTEXT,
+                                   g_param_spec_object ("context",
+                                                        "Context",
+                                                        "Context",
+                                                        GCAL_TYPE_CONTEXT,
+                                                        G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS));
+
+
   /**
    * GcalSearchPopover::active-date:
    *
diff --git a/src/gcal-window.c b/src/gcal-window.c
index 43bbc2aa..4bcaba19 100644
--- a/src/gcal-window.c
+++ b/src/gcal-window.c
@@ -1257,6 +1257,7 @@ gcal_window_constructed (GObject *object)
   g_object_bind_property (self, "context", self->month_view, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
   g_object_bind_property (self, "context", self->year_view, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
   g_object_bind_property (self, "context", self->edit_dialog, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
+  g_object_bind_property (self, "context", self->search_popover, "context", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
   g_object_bind_property (self->context, "manager", self->quick_add_popover, "manager", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
   g_object_bind_property (self, "time-format", self->edit_dialog, "time-format", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
   g_object_bind_property (self, "time-format", self->search_popover, "time-format", G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);