diff --git a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
index 29993cea4..f18126061 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Base/Menu/Menu.xml
@@ -29,9 +29,12 @@
             <Backups url="/diag_backup.php"/>
         </Configuration>
         <Firmware order="5" cssClass="fa fa-building-o fa-fw">
-            <Updates order="10" url="/ui/core/firmware/"/>
-            <Reporter order="20" url="/crash_reporter.php"/>
-            <Defaults order="50" url="/diag_defaults.php"/>
+            <Updates order="10" url="/ui/core/firmware/#changelogs"/>
+            <Packages order="20" url="/ui/core/firmware/#packages"/>
+            <Plugins order="30" url="/ui/core/firmware/#plugins"/>
+            <Settings order="40" url="/ui/core/firmware/#settings"/>
+            <Reporter order="50" url="/crash_reporter.php"/>
+            <Defaults order="60" url="/diag_defaults.php"/>
         </Firmware>
         <HighAvailability order="50" VisibleName="High Availability" cssClass="fa fa-refresh fa-fw">
             <Settings order="100" url="/system_hasync.php"/>
diff --git a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
index d0f353607..971c41bf6 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Core/firmware.volt
@@ -462,6 +462,14 @@ POSSIBILITY OF SUCH DAMAGE.
                 $("#change_mirror_progress").removeClass("fa fa-spinner fa-pulse");
             });
         });
+
+        // update history on tab state and implement navigation
+        if(window.location.hash != "") {
+            $('a[href="' + window.location.hash + '"]').click()
+        }
+        $('.nav-tabs a').on('shown.bs.tab', function (e) {
+            history.pushState(null, null, e.target.hash);
+        });
     });
 </script>
 
@@ -477,15 +485,21 @@ POSSIBILITY OF SUCH DAMAGE.
     <div class="row">
         <div class="col-md-12" id="content">
             <ul class="nav nav-tabs" data-tabs="tabs">
-                <li id="settingstab" class="active"><a data-toggle="tab" href="#settings">{{ lang._('Settings') }}</a></li>
-                <li id="packagestab"><a data-toggle="tab" href="#packages">{{ lang._('Packages') }}</a></li>
+                <li id="packagestab" class="active"><a data-toggle="tab" href="#packages">{{ lang._('Packages') }}</a></li>
                 <li id="plugintab"><a data-toggle="tab" href="#plugins">{{ lang._('Plugins') }}</a></li>
+                <li id="settingstab"><a data-toggle="tab" href="#settings">{{ lang._('Settings') }}</a></li>
                 <li id="changelogtab"><a data-toggle="tab" href="#changelogs">{{ lang._('Changelogs') }}</a></li>
                 <li id="updatetab"><a data-toggle="tab" href="#updates">{{ lang._('Updates') }}</a></li>
                 <li id="progresstab"><a data-toggle="tab" href="#progress">{{ lang._('Progress') }}</a></li>
             </ul>
             <div class="tab-content content-box tab-content">
-                <div id="settings" class="tab-pane fade in active">
+                <div id="packages" class="tab-pane fade in active">
+                    <table class="table table-striped table-condensed table-responsive" id="packageslist"></table>
+                </div>
+                <div id="plugins" class="tab-pane fade in">
+                    <table class="table table-striped table-condensed table-responsive" id="pluginlist"></table>
+                </div>
+                <div id="settings" class="tab-pane fade in">
                     <table class="table table-striped table-responsive">
                         <tbody>
                             <tr>
@@ -547,12 +561,6 @@ POSSIBILITY OF SUCH DAMAGE.
                         </tbody>
                     </table>
                 </div>
-                <div id="packages" class="tab-pane fade in">
-                    <table class="table table-striped table-condensed table-responsive" id="packageslist"></table>
-                </div>
-                <div id="plugins" class="tab-pane fade in">
-                    <table class="table table-striped table-condensed table-responsive" id="pluginlist"></table>
-                </div>
                 <div id="changelogs" class="tab-pane fade in">
                     <table class="table table-striped table-condensed table-responsive" id="changeloglist"></table>
                 </div>