diff --git a/src/callbacks.c b/src/callbacks.c
index f19d4b1..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;
 }
 
diff --git a/src/main.c b/src/main.c
index 3262dcf..e46ffad 100644
--- a/src/main.c
+++ b/src/main.c
@@ -54,6 +54,5 @@ int main(int argc, char * argv[])
 	if(surfer == NULL)
 		return 2;
 	gtk_main();
-	surfer_delete(surfer);
 	return 0;
 }