diff --git a/onionshare_gui/onionshare_gui.py b/onionshare_gui/onionshare_gui.py
index 4599f35b..97734797 100644
--- a/onionshare_gui/onionshare_gui.py
+++ b/onionshare_gui/onionshare_gui.py
@@ -307,6 +307,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
                     if not self.timer.isActive():
                         self.timer.start(500)
                     self.share_mode.on_reload_settings()
+                    self.receive_mode.on_reload_settings()
                     self.status_bar.clearMessage()
 
             # If we switched off the shutdown timeout setting, ensure the widget is hidden.
@@ -350,6 +351,7 @@ class OnionShareGui(QtWidgets.QMainWindow):
                 self.system_tray.showMessage(strings._('gui_tor_connection_lost', True), strings._('gui_tor_connection_error_settings', True))
 
                 self.share_mode.handle_tor_broke()
+                self.receive_mode.handle_tor_broke()
 
         # Process events from the web object
         if self.mode == self.MODE_SHARE:
diff --git a/onionshare_gui/receive_mode/__init__.py b/onionshare_gui/receive_mode/__init__.py
index 90100efa..623d3986 100644
--- a/onionshare_gui/receive_mode/__init__.py
+++ b/onionshare_gui/receive_mode/__init__.py
@@ -123,6 +123,7 @@ class ReceiveMode(Mode):
         """
         Connection to Tor broke.
         """
+        self.primary_action.hide()
         self.info_widget.hide()
 
     def handle_request_load(self, event):
@@ -166,6 +167,13 @@ class ReceiveMode(Mode):
         """
         self.uploads.finished(event["data"]["id"])
 
+    def on_reload_settings(self):
+        """
+        We should be ok to re-enable the 'Start Receive Mode' button now.
+        """
+        self.primary_action.show()
+        self.info_widget.show()
+
     def reset_info_counters(self):
         """
         Set the info counters back to zero.