diff --git a/desktop/browser.c b/desktop/browser.c
index 312067666..9447b45b4 100644
--- a/desktop/browser.c
+++ b/desktop/browser.c
@@ -176,9 +176,6 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
 		return;
 	}
 
-	browser_window_stop(bw);
-	browser_window_remove_caret(bw);
-
 	/* check we can actually handle this URL */
 	if (!fetch_can_fetch(url2)) {
 		gui_launch_url(url2);
@@ -211,6 +208,9 @@ void browser_window_go_post(struct browser_window *bw, const char *url,
 		}
 	}
 
+	browser_window_stop(bw);
+	browser_window_remove_caret(bw);
+
 	url_content = url_store_find(url2);
 	if (url_content)
 		url_content->visits++;