diff --git a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
index 5d0ca5fdd..4f702304e 100644
--- a/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/TrafficShaper/Menu/Menu.xml
@@ -1,12 +1,10 @@
 <menu>
     <Firewall>
         <Shaper order="40" cssClass="fa fa-filter fa-fw">
-            <Settings order="10" url="/ui/trafficshaper">
-                <Pipes url="/ui/trafficshaper#pipes"/>
-                <Queues url="/ui/trafficshaper#queues"/>
-                <Rules url="/ui/trafficshaper#rules"/>
-            </Settings>
-            <Status order="20" url="/ui/trafficshaper/service/statistics"/>
+            <Pipes order="10" url="/ui/trafficshaper#pipes"/>
+            <Queues order="20" url="/ui/trafficshaper#queues"/>
+            <Rules order="30" url="/ui/trafficshaper#rules"/>
+            <Status order="40" url="/ui/trafficshaper/service/statistics"/>
         </Shaper>
     </Firewall>
 </menu>
diff --git a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
index 1d5cc621a..e06ce7950 100644
--- a/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/TrafficShaper/index.volt
@@ -126,6 +126,9 @@ POSSIBILITY OF SUCH DAMAGE.
         $('.nav-tabs a').on('shown.bs.tab', function (e) {
             history.pushState(null, null, e.target.hash);
         });
+        $(window).on('hashchange', function(e) {
+            $('a[href="' + window.location.hash + '"]').click()
+        });
     });