diff --git a/src/callbacks.c b/src/callbacks.c
index 9a38182..8964efa 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -41,10 +41,9 @@ gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data)
 {
 	Surfer * surfer = data;
 
-	if(surfer_cnt == 1)
+	surfer_delete(surfer);
+	if(surfer_cnt == 0)
 		gtk_main_quit();
-	else
-		surfer_delete(surfer);
 	return FALSE;
 }
 
@@ -53,12 +52,7 @@ gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data)
 /* file menu */
 void on_file_close(GtkWidget * widget, gpointer data)
 {
-	Surfer * surfer = data;
-
-	if(surfer_cnt == 1)
-		gtk_main_quit();
-	else
-		surfer_delete(surfer);
+	on_closex(widget, NULL, data);
 }