diff --git a/glade/main.glade b/glade/main.glade
index 83e25ee..72e69ec 100644
--- a/glade/main.glade
+++ b/glade/main.glade
@@ -6,7 +6,6 @@
     <property name="height_request">250</property>
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <signal name="delete-event" handler="on_window_close" swapped="no"/>
     <child type="titlebar">
       <object class="GtkHeaderBar">
         <property name="name">header</property>
diff --git a/main.c b/main.c
index 1027cf8..2e455d5 100644
--- a/main.c
+++ b/main.c
@@ -246,6 +246,9 @@ int main(int argc, char **argv)
 	open_data.main_window = GTK_WINDOW(gtk_builder_get_object(main_builder, "main-window"));
 	g_signal_connect(GTK_WIDGET(gtk_builder_get_object(main_builder, "button-load-gds")),
 			 "clicked", G_CALLBACK(on_load_gds), (gpointer)&open_data);
+
+	/* Connect delete-event */
+	g_signal_connect(GTK_WIDGET(open_data.main_window), "delete-event", G_CALLBACK(on_window_close), NULL);
 	
 
 	/* Connect Convert button */