diff --git a/src/components/filetree.html b/src/components/filetree.html
index a4b3c3f61..13a27da7d 100644
--- a/src/components/filetree.html
+++ b/src/components/filetree.html
@@ -14,10 +14,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="busy || cwd === '/'"><i class="fas fa-arrow-left"></i></button><button class="btn btn-primary" ng-disabled="busy || busyRefresh" ng-click="refresh()"><i class="fas fa-redo" ng-class="{ 'fa-spin': busyRefresh }"></i></button>
+    <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-disabled="busyRefresh" ng-click="refresh()"><i class="fas fa-redo" ng-class="{ 'fa-spin': busyRefresh }"></i></button>
   </div>
   <div class="btn-group path-parts" role="group">
-    <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>
+    <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>
   </div>
   <div style="display: block;">
     <div class="btn-group">
diff --git a/src/components/filetree.js b/src/components/filetree.js
index 7026172e1..1c0491b69 100644
--- a/src/components/filetree.js
+++ b/src/components/filetree.js
@@ -78,6 +78,8 @@ function FileTreeController($scope, $translate, $timeout, Client) {
 
         $scope.busy = true;
 
+        $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('/') }; });
+
         // nothing changes here, mostly triggered when editor is closed
         if ($scope.cwd === path) {
             $scope.busy = false;
@@ -92,8 +94,6 @@ function FileTreeController($scope, $translate, $timeout, Client) {
                 $scope.cwd = path;
                 $scope.selected = [];
 
-                $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();
             } else if (entry.isFile) {