diff --git a/httpdocs/js/ays_utils.js b/httpdocs/js/ays_utils.js
index 5fd3ef82da..8a738a43d7 100644
--- a/httpdocs/js/ays_utils.js
+++ b/httpdocs/js/ays_utils.js
@@ -19,13 +19,6 @@ function aysHandleForm(form_selector, options) {
   var o = $.extend(true, {}, default_options, options);
   o.form_selector = form_selector;
 
-  if (o.handle_tabs) {
-    // Ensure li items have a "btn" class, otherwise we cannot disable them
-    $(".nav-tabs").find("a").each(function() {
-      $(this).addClass("btn");
-    });
-  }
-
   $(function() {
     $(o.form_selector).areYouSure(o.ays_options);
 
@@ -47,7 +40,7 @@ function aysHandleForm(form_selector, options) {
         // Disable navigation between tabs
         $(".nav-tabs").find("a").each(function() {
           if (! $(this).closest("li").hasClass("active"))
-            $(this).attr("disabled", "disabled");
+            $(this).removeAttr("data-toggle").closest("li").addClass("disabled");
          });
       }
 
@@ -59,7 +52,7 @@ function aysHandleForm(form_selector, options) {
       $(o.form_selector).find('button[type="submit"]').attr("disabled", "disabled");
 
     if (o.handle_datatable) {
-      // Enabled pagination controls
+        // Enabled pagination controls
         $(this).find("a.dropdown-toggle").removeAttr("disabled");
         $(this).find("ul.pagination a").css("pointer-events", "").css("cursor", "");
       }
@@ -67,7 +60,7 @@ function aysHandleForm(form_selector, options) {
       if (o.handle_tabs) {
         // Enable navigation between tabs
         $(".nav-tabs").find("a").each(function() {
-          $(this).removeAttr("disabled");
+          $(this).attr("data-toggle", "tab").closest("li").removeClass("disabled");
         });
       }
 
diff --git a/scripts/lua/if_stats.lua b/scripts/lua/if_stats.lua
index 51536d33bf..f3be8396b4 100644
--- a/scripts/lua/if_stats.lua
+++ b/scripts/lua/if_stats.lua
@@ -1162,10 +1162,10 @@ end
       jsUrlChange("if_stats.lua?id="..ifid.."&page=filtering&network="..target_net.."#protocols")
    end
    print [[
-   <ul id="filterPageTabPanel" class="nav nav-tabs">
-      <li><a data-toggle="tab" class="btn" href="#protocols">]] print(i18n("shaping.manage_networks")) print[[</a></li>
-      <li><a data-toggle="tab" class="btn" href="#networks">]] print(i18n("shaping.create_networks")) print[[</a></li>
-      <li><a data-toggle="tab" class="btn" href="#shapers">]] print(i18n("shaping.bandwidth_manager")) print[[</a></li>
+   <ul id="filterPageTabPanel" class="nav nav-tabs" role="tablist">
+      <li><a data-toggle="tab" role="tab" href="#protocols">]] print(i18n("shaping.manage_networks")) print[[</a></li>
+      <li><a data-toggle="tab" role="tab" href="#networks">]] print(i18n("shaping.create_networks")) print[[</a></li>
+      <li><a data-toggle="tab" role="tab" href="#shapers">]] print(i18n("shaping.bandwidth_manager")) print[[</a></li>
    </ul>
    <div class="tab-content">]]
 
@@ -1850,7 +1850,6 @@ print [[</form>
    /*** Page Tab State ***/
    $('#filterPageTabPanel a').click(function(e) {
      e.preventDefault();
-     $(this).tab('show');
    });
 
    // store the currently selected tab in the hash value