diff --git a/src/gui/src/UI/Dashboard/TabSecurity.js b/src/gui/src/UI/Dashboard/TabSecurity.js
index dd70320e2..8acd7358d 100644
--- a/src/gui/src/UI/Dashboard/TabSecurity.js
+++ b/src/gui/src/UI/Dashboard/TabSecurity.js
@@ -128,8 +128,10 @@ const TabSecurity = {
 
         $el_window.find('.dashboard-section-security .toggle-2fa').on('change', async function (e) {
             const $toggle = $(this);
+            const $label = $toggle.closest('.dashboard-switch');
             const enabling = $toggle.is(':checked');
             $toggle.prop('disabled', true);
+            $label.addClass('dashboard-switch-pending');
 
             const window_options = {
                 parent_uuid: $el_window.attr('data-element_uuid'),
@@ -146,6 +148,7 @@ const TabSecurity = {
             const succeeded = await promise;
 
             $toggle.prop('disabled', false);
+            $label.removeClass('dashboard-switch-pending');
 
             if ( ! succeeded ) {
                 $toggle.prop('checked', ! enabling);
diff --git a/src/gui/src/css/dashboard.css b/src/gui/src/css/dashboard.css
index 15e2a6143..d9ab864c5 100644
--- a/src/gui/src/css/dashboard.css
+++ b/src/gui/src/css/dashboard.css
@@ -3285,6 +3285,14 @@ body {
     cursor: not-allowed;
 }
 
+.dashboard-switch.dashboard-switch-pending input + .dashboard-switch-slider {
+    background-color: #b0b0b0;
+}
+
+.dashboard-switch.dashboard-switch-pending input + .dashboard-switch-slider::before {
+    transform: translateX(10px);
+}
+
 /* Danger zone */
 .dashboard-danger-zone {
     padding-top: 24px;