diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js
index 86221ca4..d762f1e5 100644
--- a/src/octoprint/static/js/app/main.js
+++ b/src/octoprint/static/js/app/main.js
@@ -478,6 +478,15 @@ $(function() {
         // reload overlay
         $("#reloadui_overlay_reload").click(function() { location.reload(); });
 
+        var changeTab = function()
+        {
+            var hashtag = window.location.hash;
+
+            var tab = $('#tabs a[href="' + hashtag + '"]');
+            tab.tab("show");
+            onTabChange(hashtag);
+        }
+
         //~~ view model binding
 
         var bindViewModels = function() {
@@ -566,6 +575,15 @@ $(function() {
                 callViewModels(allViewModels, "onBrowserTabVisibilityChange", [status]);
             });
 
+            $(window).on("hashchange", function() {
+                changeTab();
+            });
+
+            if (window.location.hash != "")
+            {
+                changeTab();
+            }
+
             log.info("Application startup complete");
         };