diff --git a/src/gui/gcal-search-button.c b/src/gui/gcal-search-button.c
index e67b84a2..54f662aa 100644
--- a/src/gui/gcal-search-button.c
+++ b/src/gui/gcal-search-button.c
@@ -140,15 +140,6 @@ on_focus_controller_leave_cb (GtkEventControllerFocus *focus_controller,
   gtk_editable_set_text (self->entry, "");
 }
 
-static void
-on_entry_icon_pressed_cb (GtkEntry             *entry,
-                          GtkEntryIconPosition  position,
-                          GcalSearchButton     *self)
-{
-  if (position == GTK_ENTRY_ICON_PRIMARY)
-    gtk_stack_set_visible_child_name (self->stack, "button");
-}
-
 static void
 on_search_finished_cb (GObject      *source_object,
                        GAsyncResult *result,
@@ -356,7 +347,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_icon_pressed_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_entry_text_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);
diff --git a/src/gui/gcal-search-button.ui b/src/gui/gcal-search-button.ui
index b6363521..112000ed 100644
--- a/src/gui/gcal-search-button.ui
+++ b/src/gui/gcal-search-button.ui
@@ -49,11 +49,9 @@
           <object class="GtkStackPage">
             <property name="name">entry</property>
             <property name="child">
-              <object class="GtkEntry" id="entry">
+              <object class="GtkSearchEntry" id="entry">
                 <property name="max-width-chars">0</property>
-                <property name="primary-icon-name">edit-find-symbolic</property>
                 <property name="width-chars">0</property>
-                <signal name="icon-press" handler="on_entry_icon_pressed_cb" object="GcalSearchButton" swapped="no" />
                 <signal name="notify::text" handler="on_entry_text_changed_cb" object="GcalSearchButton" swapped="no" />
 
                 <child>