diff --git a/src/callbacks.c b/src/callbacks.c
index 8ff38c3..a666b4f 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -45,8 +45,6 @@ gboolean on_closex(gpointer data)
 	Surfer * surfer = data;
 
 	surfer_delete(surfer);
-	if(surfer_cnt == 0)
-		gtk_main_quit();
 	return FALSE;
 }
 
diff --git a/src/surfer.c b/src/surfer.c
index 732d8e2..155b630 100644
--- a/src/surfer.c
+++ b/src/surfer.c
@@ -313,7 +313,8 @@ void surfer_delete(Surfer * surfer)
 	free(surfer->url);
 	free(surfer->homepage);
 	free(surfer);
-	surfer_cnt--;
+	if(--surfer_cnt == 0)
+		gtk_main_quit();
 }
 
 
diff --git a/src/surfer.h b/src/surfer.h
index 0a461b6..eb3b298 100644
--- a/src/surfer.h
+++ b/src/surfer.h
@@ -45,10 +45,6 @@
 typedef struct _Surfer Surfer;
 
 
-/* variables */
-extern unsigned int surfer_cnt;
-
-
 /* functions */
 Surfer * surfer_new(char const * url);
 Surfer * surfer_new_copy(Surfer * surfer);