diff --git a/actions/tor b/actions/tor
index c0d7155a2..3fbc68f24 100755
--- a/actions/tor
+++ b/actions/tor
@@ -235,6 +235,7 @@ def _enable_hs(restart=True):
                 tries += 1
                 if tries >= 12:
                     return
+
                 time.sleep(10)
 
 
@@ -325,6 +326,7 @@ def _update_ports():
         tries += 1
         if tries >= 12:
             return
+
         time.sleep(10)
 
     lines = """<?xml version="1.0" encoding="utf-8"?>
@@ -340,6 +342,8 @@ def _update_ports():
         except FileNotFoundError:
             return
 
+    # XXX: We should ideally do firewalld reload instead.  However,
+    # firewalld seems to fail to successfully reload sometimes.
     action_utils.service_restart('firewalld')
 
 
diff --git a/plinth/modules/tor/views.py b/plinth/modules/tor/views.py
index 2ecb5693c..120e42133 100644
--- a/plinth/modules/tor/views.py
+++ b/plinth/modules/tor/views.py
@@ -82,6 +82,11 @@ def _apply_changes(request, old_status, new_status):
 
 def __apply_changes(request, old_status, new_status):
     """Apply the changes."""
+    global config_process
+    if config_process:
+        # Already running a configuration task
+        return
+
     arguments = []
 
     if old_status['enabled'] != new_status['enabled']:
@@ -100,10 +105,8 @@ def __apply_changes(request, old_status, new_status):
         arguments.extend(['--apt-transport-tor', arg_value])
 
     if arguments:
-        global config_process
-        if not config_process:
-            config_process = actions.superuser_run(
-                'tor', ['configure'] + arguments, async=True)
+        config_process = actions.superuser_run(
+            'tor', ['configure'] + arguments, async=True)
     else:
         messages.info(request, _('Setting unchanged'))
 
@@ -144,6 +147,6 @@ def _collect_config_result(request):
     if not return_code:
         messages.success(request, _('Configuration updated.'))
     else:
-        messages.info(request, _('Error occurred during configuration.'))
+        messages.error(request, _('An error occurred during configuration.'))
 
     config_process = None