diff --git a/src/gui/gcal-search-button.c b/src/gui/gcal-search-button.c
index 32aa3a8e..2c6c7363 100644
--- a/src/gui/gcal-search-button.c
+++ b/src/gui/gcal-search-button.c
@@ -74,7 +74,6 @@ static void
 hide_suggestions (GcalSearchButton *self)
 {
   gtk_revealer_set_reveal_child (self->results_revealer, FALSE);
-  gtk_editable_set_text (self->entry, "");
 }
 
 static GtkWidget *
@@ -191,16 +190,6 @@ on_entry_search_changed_cb (GtkSearchEntry   *entry,
   GCAL_EXIT;
 }
 
-static void
-on_popover_closed_cb (GtkPopover       *popover,
-                      GcalSearchButton *self)
-{
-  gtk_editable_set_width_chars (self->entry, 0);
-  gtk_editable_set_max_width_chars (self->entry, 0);
-  gtk_editable_set_text (self->entry, "");
-  gtk_stack_set_visible_child_name (self->stack, "button");
-}
-
 static void
 on_results_listbox_row_activated_cb (GtkListBox       *listbox,
                                      GcalSearchHitRow *row,
@@ -355,7 +344,6 @@ gcal_search_button_class_init (GcalSearchButtonClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, on_button_clicked_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_focus_controller_leave_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_entry_search_changed_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_popover_closed_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_results_listbox_row_activated_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_results_revealer_child_reveal_state_changed_cb);
 
diff --git a/src/gui/gcal-search-button.ui b/src/gui/gcal-search-button.ui
index 2cf941f6..5c3a40f2 100644
--- a/src/gui/gcal-search-button.ui
+++ b/src/gui/gcal-search-button.ui
@@ -78,7 +78,6 @@
     <property name="position">bottom</property>
     <property name="autohide">False</property>
     <property name="default-widget">results_listbox</property>
-    <signal name="closed" handler="on_popover_closed_cb" object="GcalSearchButton" swapped="no" />
     <style>
       <class name="menu" />
     </style>