diff --git a/src/filemanager.html b/src/filemanager.html
index a23fbb25f..1eef85d16 100644
--- a/src/filemanager.html
+++ b/src/filemanager.html
@@ -287,16 +287,15 @@
 
         <h4 class="text-center">{{ title }}</h4>
 
-        <div style="margin-bottom: 10px;">
-          <div class="btn-group" role="group">
-            <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>
+        <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>
           </div>
-          <div class="btn-group" role="group">
-            <button class="btn btn-default" ng-disabled="cwd === '/'" ng-click="changeDirectory('/')"><i class="fas fa-home"></i> / </button>
-            <button class="btn btn-default" ng-disabled="part.path === cwd" ng-click="changeDirectory(part.path)" ng-repeat="part in cwdParts">{{ part.name }}</button>
+          <div class="btn-group path-parts" role="group">
+            <button class="btn btn-default" ng-disabled="cwd === '/'" ng-click="changeDirectory('/')"><i class="fas fa-home"></i> / </button><button class="btn btn-default" ng-disabled="part.path === cwd" ng-click="changeDirectory(part.path)" ng-repeat="part in cwdParts">{{ part.name }}</button>
           </div>
-          <div class="pull-right">
+          <div style="display: block;">
             <div class="btn-group">
               <button type="button" class="btn btn-primary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-plus"></i> {{ 'filemanager.toolbar.new' | tr }}</button>
               <ul class="dropdown-menu">
diff --git a/src/theme.scss b/src/theme.scss
index 2c631d943..c6268c82d 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1718,6 +1718,26 @@ tag-input {
 
 .filemanager {
 
+    .toolbar {
+        display: flex;
+        margin-bottom: 10px;
+
+        button {
+            float: none;
+        }
+
+        div {
+            white-space: nowrap;
+        }
+
+        .path-parts {
+            margin: 0 5px;
+            white-space: nowrap;
+            overflow: auto;
+            flex-grow: 1;
+        }
+    }
+
     .text-editor {
         display: flex;
         padding: 10px;