diff --git a/plinth/modules/tor/templates/tor.html b/plinth/modules/tor/templates/tor.html
index ff881b086..2bd0be414 100644
--- a/plinth/modules/tor/templates/tor.html
+++ b/plinth/modules/tor/templates/tor.html
@@ -154,19 +154,14 @@
 
         $('#id_tor-use_upstream_bridges').change(function() {
             if ($('#id_tor-use_upstream_bridges').prop('checked')) {
-                $('#id_tor-upstream_bridges').show('slow');
-                $('label[for="id_tor-upstream_bridges"]').show('slow');
-                $('label[for="id_tor-upstream_bridges"]').parent().show('slow');
-                $('#id_tor-relay_enabled').prop('checked', false);
-                $('#id_tor-bridge_relay_enabled').prop('checked', false);
-                $('#id_tor-relay_enabled').parent().parent().parent().parent().hide('slow');
-                $('#id_tor-bridge_relay_enabled').parent().parent().parent().parent().hide('slow');
+                $('#id_tor-upstream_bridges').parent().parent().show('slow');
+                $('#id_tor-relay_enabled').prop('checked', false)
+                                          .prop('disabled', true);
+                $('#id_tor-bridge_relay_enabled').prop('checked', false)
+                                                 .prop('disabled', true);
             } else {
-                $('#id_tor-upstream_bridges').hide('slow');
-                $('label[for="id_tor-upstream_bridges"]').hide('slow');
-                $('label[for="id_tor-upstream_bridges"]').parent().hide('slow');
-                $('#id_tor-relay_enabled').parent().parent().parent().parent().show('slow');
-                $('#id_tor-bridge_relay_enabled').parent().parent().parent().parent().show('slow');
+                $('#id_tor-upstream_bridges').parent().parent().hide('slow');
+                $('#id_tor-relay_enabled').prop('disabled', false);
             }
         }).change();
     })(jQuery);