diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 54ca2ed919e..18dba2617da 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -1387,9 +1387,10 @@ <h2 class="accordion-header">
 
           this.tabs.forEach(tab => {
             Object.keys(tab.options).forEach(key => {
-              if (key === stripped_hash) {
+              if (tab.id === stripped_hash || key === stripped_hash) {
                 this.currentTab = tab.id;
-
+              }
+              if (key === stripped_hash) {
                 // sleep for 2 seconds to allow the page to load
                 setTimeout(() => {
                   let element = document.getElementById(stripped_hash);
@@ -1398,8 +1399,13 @@ <h2 class="accordion-header">
                   }
                 }, 2000);
               }
+
+              if (this.currentTab === tab.id) {
+                // stop looping
+                return true;
+              }
             });
-          })
+          });
         }
       };