diff --git a/src/fsearch.glade b/src/fsearch.glade
index fbe82688e..96b199142 100644
--- a/src/fsearch.glade
+++ b/src/fsearch.glade
@@ -137,7 +137,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <property name="default_width">800</property>
     <property name="default_height">600</property>
     <property name="icon_name">system-search</property>
-    <signal name="delete-event" handler="gtk_widget_destroy" swapped="no"/>
+    <signal name="delete-event" handler="on_fsearch_window_delete_event" swapped="no"/>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
diff --git a/src/fsearch_window.c b/src/fsearch_window.c
index fece5ba43..00841e8fb 100644
--- a/src/fsearch_window.c
+++ b/src/fsearch_window.c
@@ -990,6 +990,16 @@ on_listview_query_tooltip (GtkWidget  *widget,
     return ret_val;
 }
 
+static gboolean
+on_fsearch_window_delete_event (GtkWidget *widget,
+                        GdkEvent *event,
+                        gpointer user_data)
+{
+    fsearch_application_window_prepare_shutdown (widget);
+    gtk_widget_destroy (widget);
+    return TRUE;
+}
+
 static void
 fsearch_application_window_class_init (FsearchApplicationWindowClass *klass)
 {
@@ -1026,6 +1036,7 @@ fsearch_application_window_class_init (FsearchApplicationWindowClass *klass)
     gtk_widget_class_bind_template_child (widget_class, FsearchApplicationWindow, revealer);
     gtk_widget_class_bind_template_child (widget_class, FsearchApplicationWindow, scrolledwindow1);
 
+    gtk_widget_class_bind_template_callback (widget_class, on_fsearch_window_delete_event);
     gtk_widget_class_bind_template_callback (widget_class, on_search_entry_changed);
     gtk_widget_class_bind_template_callback (widget_class, on_listview_button_press_event);
     gtk_widget_class_bind_template_callback (widget_class, on_listview_key_press_event);