diff --git a/onionshare_gui/threads.py b/onionshare_gui/threads.py
index f4acc5e1..2af0120d 100644
--- a/onionshare_gui/threads.py
+++ b/onionshare_gui/threads.py
@@ -41,14 +41,6 @@ class OnionThread(QtCore.QThread):
     def run(self):
         self.mode.common.log('OnionThread', 'run')
 
-        try:
-            self.mode.app.start_onion_service()
-            self.success.emit()
-
-        except (TorTooOld, TorErrorInvalidSetting, TorErrorAutomatic, TorErrorSocketPort, TorErrorSocketFile, TorErrorMissingPassword, TorErrorUnreadableCookieFile, TorErrorAuthError, TorErrorProtocolError, BundledTorTimeout, OSError) as e:
-            self.error.emit(e.args[0])
-            return
-
         self.mode.app.stay_open = not self.mode.common.settings.get('close_after_first_download')
 
         # start onionshare http service in new thread
@@ -58,6 +50,14 @@ class OnionThread(QtCore.QThread):
         # wait for modules in thread to load, preventing a thread-related cx_Freeze crash
         time.sleep(0.2)
 
+        try:
+            self.mode.app.start_onion_service()
+            self.success.emit()
+
+        except (TorTooOld, TorErrorInvalidSetting, TorErrorAutomatic, TorErrorSocketPort, TorErrorSocketFile, TorErrorMissingPassword, TorErrorUnreadableCookieFile, TorErrorAuthError, TorErrorProtocolError, BundledTorTimeout, OSError) as e:
+            self.error.emit(e.args[0])
+            return
+
 
 class WebThread(QtCore.QThread):
     """