diff --git a/po/de.po b/po/de.po
index b45f34f..e5ddb94 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Surfer 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 13:10+0100\n"
+"POT-Creation-Date: 2011-03-16 15:31+0100\n"
 "PO-Revision-Date: 2010-04-01 19:40+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: German\n"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Error "
 msgstr "Fehler "
 
-#: ../src/download.c:530 ../src/download.c:663
+#: ../src/download.c:530 ../src/download.c:657
 msgid "Complete"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 94105cd..5c922dc 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Surfer 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 13:10+0100\n"
+"POT-Creation-Date: 2011-03-16 15:31+0100\n"
 "PO-Revision-Date: 2010-04-01 19:40+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Spanish\n"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Error "
 msgstr ""
 
-#: ../src/download.c:530 ../src/download.c:663
+#: ../src/download.c:530 ../src/download.c:657
 msgid "Complete"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 6a5f829..1365f87 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Surfer 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 13:10+0100\n"
+"POT-Creation-Date: 2011-03-16 15:31+0100\n"
 "PO-Revision-Date: 2010-04-01 19:40+0200\n"
 "Last-Translator: Calimero <calimeroteknik@free.fr>\n"
 "Language-Team: French\n"
@@ -163,7 +163,7 @@ msgstr "%.1f de %.1f %s"
 msgid "Error "
 msgstr "Erreur "
 
-#: ../src/download.c:530 ../src/download.c:663
+#: ../src/download.c:530 ../src/download.c:657
 msgid "Complete"
 msgstr "Terminé"
 
diff --git a/po/it.po b/po/it.po
index 8d2e2fd..7efb70d 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Surfer 0.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-11 13:10+0100\n"
+"POT-Creation-Date: 2011-03-16 15:31+0100\n"
 "PO-Revision-Date: 2010-04-11 12:06+0200\n"
 "Last-Translator: Pierre Pronchery <khorben@defora.org>\n"
 "Language-Team: Italian\n"
@@ -161,7 +161,7 @@ msgstr ""
 msgid "Error "
 msgstr ""
 
-#: ../src/download.c:530 ../src/download.c:663
+#: ../src/download.c:530 ../src/download.c:657
 msgid "Complete"
 msgstr ""
 
diff --git a/src/download.c b/src/download.c
index 711f680..86a1f89 100644
--- a/src/download.c
+++ b/src/download.c
@@ -654,12 +654,6 @@ static gboolean _download_on_timeout(gpointer data)
 		case WEBKIT_DOWNLOAD_STATUS_FINISHED:
 			/* XXX pasted from _http_data_complete */
 			ret = FALSE;
-			if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
-							d->check)))
-			{
-				g_idle_add(_download_on_closex, d);
-				break;
-			}
 			gtk_label_set_text(GTK_LABEL(d->status), _("Complete"));
 			gtk_widget_set_sensitive(d->check, FALSE);
 			gtk_button_set_label(GTK_BUTTON(d->cancel),
@@ -668,6 +662,12 @@ static gboolean _download_on_timeout(gpointer data)
 					d->conn);
 			g_object_unref(d->conn);
 			d->conn = NULL;
+			if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(
+							d->check)))
+			{
+				g_idle_add(_download_on_closex, d);
+				break;
+			}
 			break;
 		case WEBKIT_DOWNLOAD_STATUS_STARTED:
 			gtk_label_set_text(GTK_LABEL(d->status),