diff --git a/src/octoprint/static/js/app/main.js b/src/octoprint/static/js/app/main.js
index 86221ca4..80b1701e 100644
--- a/src/octoprint/static/js/app/main.js
+++ b/src/octoprint/static/js/app/main.js
@@ -478,6 +478,17 @@ $(function() {
         // reload overlay
         $("#reloadui_overlay_reload").click(function() { location.reload(); });
 
+        var changeTab = function()
+        {
+            var hashtag = window.location.hash;
+            var tab = $('#tabs a[href="' + hashtag + '"]');
+            if (tab.length)
+            {
+                tab.tab("show");
+                onTabChange(hashtag);
+            }
+        }
+
         //~~ view model binding
 
         var bindViewModels = function() {
@@ -566,6 +577,15 @@ $(function() {
                 callViewModels(allViewModels, "onBrowserTabVisibilityChange", [status]);
             });
 
+            $(window).on("hashchange", function() {
+                changeTab();
+            });
+
+            if (window.location.hash != "")
+            {
+                changeTab();
+            }
+
             log.info("Application startup complete");
         };
 
diff --git a/src/octoprint/static/js/app/viewmodels/files.js b/src/octoprint/static/js/app/viewmodels/files.js
index 24695b2d..2563ebe8 100644
--- a/src/octoprint/static/js/app/viewmodels/files.js
+++ b/src/octoprint/static/js/app/viewmodels/files.js
@@ -708,11 +708,12 @@ $(function() {
                         return false;
                     }
 
-                    if (entry["type"] == "folder" && entry["children"]) {
+                    var success = entry["name"].toLocaleLowerCase().indexOf(query) > -1;
+                    if (!success && entry["type"] == "folder" && entry["children"]) {
                         return _.any(entry["children"], recursiveSearch);
-                    } else {
-                        return entry["name"].toLocaleLowerCase().indexOf(query) > -1;
                     }
+
+                    return success;
                 };
 
                 self.listHelper.changeSearchFunction(recursiveSearch);