diff --git a/onionshare_gui/settings_dialog.py b/onionshare_gui/settings_dialog.py
index fed4d1ab..df806a06 100644
--- a/onionshare_gui/settings_dialog.py
+++ b/onionshare_gui/settings_dialog.py
@@ -505,7 +505,11 @@ class SettingsDialog(QtWidgets.QDialog):
         Cancel button clicked.
         """
         common.log('SettingsDialog', 'cancel_clicked')
-        self.close()
+        if not self.onion.connected_to_tor:
+            Alert(strings._('gui_tor_connection_canceled', True), QtWidgets.QMessageBox.Warning)
+            sys.exit()
+        else:
+            self.close()
 
     def help_clicked(self):
         """
diff --git a/share/locale/en.json b/share/locale/en.json
index fedd1af4..0a985d82 100644
--- a/share/locale/en.json
+++ b/share/locale/en.json
@@ -112,5 +112,6 @@
     "gui_tor_connection_ask_open_settings": "Open Settings",
     "gui_tor_connection_ask_quit": "Quit",
     "gui_tor_connection_error_settings": "Try adjusting how OnionShare connects to the Tor network in Settings.",
+    "gui_tor_connection_canceled": "OnionShare is disconnected from Tor.\n\nPlease re-open OnionShare and configure the Tor connection.",
     "share_via_onionshare": "Share via OnionShare"
 }