diff --git a/src/browser.c b/src/browser.c
index 8b962b3..d31cec9 100644
--- a/src/browser.c
+++ b/src/browser.c
@@ -253,8 +253,8 @@ Browser * browser_new(char const * directory)
 	gtk_window_set_icon_name(GTK_WINDOW(browser->window), ICON_NAME);
 #endif
 	gtk_window_set_title(GTK_WINDOW(browser->window), _("File browser"));
-	g_signal_connect(browser->window, "delete-event", G_CALLBACK(on_closex),
-			browser);
+	g_signal_connect_swapped(browser->window, "delete-event", G_CALLBACK(
+				on_closex), browser);
 	vbox = gtk_vbox_new(FALSE, 0);
 	/* menubar */
 #ifndef EMBEDDED
diff --git a/src/callbacks.c b/src/callbacks.c
index 9151adb..fae0572 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -58,7 +58,7 @@ static GList * _copy_selection(Browser * browser);
 /* functions */
 /* callbacks */
 /* window */
-gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data)
+gboolean on_closex(gpointer data)
 {
 	Browser * browser = data;
 
@@ -73,7 +73,7 @@ gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data)
 /* on_close */
 gboolean on_close(gpointer data)
 {
-	on_closex(NULL, NULL, data);
+	on_closex(data);
 	return FALSE;
 }
 
@@ -146,7 +146,7 @@ void on_file_new_symlink(gpointer data)
 
 void on_file_close(gpointer data)
 {
-	on_closex(NULL, NULL, data);
+	on_closex(data);
 }
 
 
@@ -238,8 +238,7 @@ void on_edit_unselect_all(gpointer data)
 /* on_edit_preferences */
 static void _preferences_set(Browser * browser);
 /* callbacks */
-static gboolean _preferences_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data);
+static gboolean _preferences_on_closex(gpointer data);
 static void _preferences_on_cancel(gpointer data);
 static void _preferences_on_ok(gpointer data);
 
@@ -326,8 +325,7 @@ static void _preferences_set(Browser * browser)
 			browser->prefs.show_hidden_files);
 }
 
-static gboolean _preferences_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data)
+static gboolean _preferences_on_closex(gpointer data)
 {
 	Browser * browser = data;
 
diff --git a/src/callbacks.h b/src/callbacks.h
index f61fb86..4e64c11 100644
--- a/src/callbacks.h
+++ b/src/callbacks.h
@@ -22,7 +22,7 @@
 
 
 /* window */
-gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data);
+gboolean on_closex(gpointer data);
 
 /* accelerators */
 gboolean on_close(gpointer data);
diff --git a/src/copy.c b/src/copy.c
index 0dd25a5..4d55a3d 100644
--- a/src/copy.c
+++ b/src/copy.c
@@ -89,8 +89,7 @@ typedef struct _Copy
 static void _copy_refresh(Copy * copy);
 
 /* callbacks */
-static void _copy_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data);
+static void _copy_on_closex(void);
 static gboolean _copy_idle_first(gpointer data);
 
 static int _copy(Prefs * prefs, unsigned int filec, char * filev[])
@@ -234,8 +233,7 @@ static int _copy_confirm(Copy * copy, char const * dst)
 	return ret == GTK_RESPONSE_YES ? 1 : 0;
 }
 
-static void _copy_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data)
+static void _copy_on_closex(void)
 {
 	gtk_main_quit();
 }
diff --git a/src/delete.c b/src/delete.c
index ae7d808..a4e451d 100644
--- a/src/delete.c
+++ b/src/delete.c
@@ -63,8 +63,7 @@ typedef struct _Delete
 static void _delete_refresh(Delete * delete);
 
 /* callbacks */
-static void _delete_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data);
+static void _delete_on_closex(void);
 static gboolean _delete_idle(gpointer data);
 
 static int _delete(Prefs * prefs, unsigned int filec, char * filev[])
@@ -133,8 +132,7 @@ static int _delete_error(Delete * delete, char const * message, int ret)
 	return ret;
 }
 
-static void _delete_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data)
+static void _delete_on_closex(void)
 {
 	gtk_main_quit();
 }
diff --git a/src/move.c b/src/move.c
index 8c50c53..b02990b 100644
--- a/src/move.c
+++ b/src/move.c
@@ -66,8 +66,7 @@ typedef struct _Move
 static void _move_refresh(Move * move);
 
 /* callbacks */
-static void _move_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data);
+static void _move_on_closex(void);
 static gboolean _move_idle_first(gpointer data);
 
 static int _move(Prefs * prefs, unsigned int filec, char * filev[])
@@ -149,8 +148,7 @@ static int _move_confirm(Move * move, char const * dst)
 	return ret == GTK_RESPONSE_YES ? 1 : 0;
 }
 
-static void _move_on_closex(GtkWidget * widget, GdkEvent * event,
-		gpointer data)
+static void _move_on_closex(void)
 {
 	gtk_main_quit();
 }
diff --git a/tools/iconlist.c b/tools/iconlist.c
index fa30f58..1ff8227 100644
--- a/tools/iconlist.c
+++ b/tools/iconlist.c
@@ -82,7 +82,7 @@ static int _iconlist_list(char * theme)
 /* iconlist_do */
 static void _do_iconview(GtkWidget * iconview, char const * theme);
 /* callbacks */
-static gboolean _on_closex(GtkWidget * widget, GdkEvent * event, gpointer data);
+static gboolean _on_closex(GtkWidget * widget);
 static void _on_theme_activate(GtkWidget * widget, gpointer data);
 
 static int _iconlist_do(void)
@@ -138,7 +138,7 @@ static int _iconlist_do(void)
 	return 0;
 }
 
-static gboolean _on_closex(GtkWidget * widget, GdkEvent * event, gpointer data)
+static gboolean _on_closex(GtkWidget * widget)
 {
 	gtk_widget_hide(widget);
 	gtk_main_quit();