diff --git a/src/callbacks.c b/src/callbacks.c
index 47d0ca0..2b2c8d0 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -39,9 +39,10 @@ gboolean on_closex(GtkWidget * widget, GdkEvent * event, gpointer data)
 {
 	Surfer * surfer = data;
 
-	surfer_delete(surfer);
-	if(surfer_cnt == 0)
+	if(surfer_cnt == 1)
 		gtk_main_quit();
+	else
+		surfer_delete(surfer);
 	return FALSE;
 }
 
@@ -51,9 +52,10 @@ void on_file_close(GtkWidget * widget, gpointer data)
 {
 	Surfer * surfer = data;
 
-	surfer_delete(surfer);
-	if(surfer_cnt == 0)
+	if(surfer_cnt == 1)
 		gtk_main_quit();
+	else
+		surfer_delete(surfer);
 }