diff --git a/src/filemanager.html b/src/filemanager.html
index ee1926066..47fd02cc5 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -298,10 +298,10 @@
         <div class="toolbar">
           <div class="btn-group" role="group" style="display: block;">
             <!-- TODO figure out why a line break in code between the two buttons results in a gap visually without any margin/padding set -->
-            <button class="btn btn-primary" ng-click="goDirectoryUp()" ng-disabled="cwd === '/'"><i class="fas fa-arrow-left"></i></button><button class="btn btn-primary" ng-click="refresh()"><i class="fas fa-sync-alt"></i></button>
+            <button class="btn btn-primary" ng-click="goDirectoryUp()" ng-disabled="busy || cwd === '/'"><i class="fas fa-arrow-left"></i></button><button class="btn btn-primary" ng-disabled="busy" ng-click="refresh()"><i class="fas fa-sync-alt"></i></button>
           </div>
           <div class="btn-group path-parts" role="group">
-            <button class="btn btn-default" ng-disabled="cwd === '/'" ng-click="changeDirectory('/')" ng-drop="drop($event, '/')" ng-dragleave="dragExit($event, '/')" ng-dragover="dragEnter($event, '/')"><i class="fas fa-home"></i> {{ rootDirLabel }} </button><button class="btn btn-default" ng-disabled="part.path === cwd" ng-click="changeDirectory(part.path)" ng-drop="drop($event, part.path)" ng-dragleave="dragExit($event, part.path)" ng-dragover="dragEnter($event, part.path)" ng-repeat="part in cwdParts">{{ part.name }}</button>
+            <button class="btn btn-default" ng-disabled="busy || cwd === '/'" ng-click="changeDirectory('/')" ng-drop="drop($event, '/')" ng-dragleave="dragExit($event, '/')" ng-dragover="dragEnter($event, '/')"><i class="fas fa-home"></i> {{ rootDirLabel }} </button><button class="btn btn-default" ng-disabled="busy || part.path === cwd" ng-click="changeDirectory(part.path)" ng-drop="drop($event, part.path)" ng-dragleave="dragExit($event, part.path)" ng-dragover="dragEnter($event, part.path)" ng-repeat="part in cwdParts">{{ part.name }}</button>
           </div>
           <div style="display: block;">
             <div class="btn-group">
diff --git a/src/js/filemanager.js b/src/js/filemanager.js
index 4ccf1d83c..d21ab7a16 100644
--- a/src/js/filemanager.js
+++ b/src/js/filemanager.js
@@ -144,7 +144,6 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
 
             if (entry.isDirectory) {
                 $scope.cwd = path;
-                $scope.cwdParts = path.split('/').filter(function (p) { return !!p; }).map(function (p, i) { return { name: decodeURIComponent(p), path: path.split('/').slice(0, i+1).join('/') }; });
 
                 // refresh will set busy to false once done
                 $scope.refresh();
@@ -390,6 +389,7 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
             });
 
             $scope.entries = result.entries;
+            $scope.cwdParts = $scope.cwd.split('/').filter(function (p) { return !!p; }).map(function (p, i) { return { name: decodeURIComponent(p), path: $scope.cwd.split('/').slice(0, i+1).join('/') }; });
 
             $scope.busy = false;
         });
@@ -1024,7 +1024,19 @@ app.controller('FileManagerController', ['$scope', '$translate', '$timeout', 'Cl
 
     init();
 
+    var busyHash = window.location.hash.slice(1);
+    $scope.$watch('busy', function (prev, next) {
+        if (!prev && next) {
+            window.location.hash = busyHash;
+            busyHash = window.location.hash.slice(1);
+        }
+    });
+
     window.addEventListener('hashchange', function () {
+        if ($scope.busy) return false;
+
+        busyHash = window.location.hash.slice(1);
+
         $scope.$apply(function () {
             // first close all dialogs
             $scope.mediaViewer.close();