diff --git a/lib/templates/filemanager_modal_generallayout.mustache b/lib/templates/filemanager_modal_generallayout.mustache
index c0bc89f0f58..57ac5d72413 100644
--- a/lib/templates/filemanager_modal_generallayout.mustache
+++ b/lib/templates/filemanager_modal_generallayout.mustache
@@ -31,8 +31,8 @@
 
         </div>
         <div class="col-md-9 p-0">
-            <div class="fp-repo-items" tabindex="0">
-                <div class="fp-navbar bg-faded card mb-0 clearfix icon-no-spacing">
+            <div class="fp-repo-items card" tabindex="0">
+                <div class="fp-navbar bg-faded border-bottom p-2 clearfix icon-no-spacing">
                     <div>
                         <div class="fp-toolbar">
                             <div class="fp-tb-back">
@@ -80,7 +80,7 @@
                         <span class="fp-path-folder"><a class="fp-path-folder-name aalink" href="#"></a></span>
                     </div>
                 </div>
-                <div class="fp-content card"></div>
+                <div class="fp-content mb-1"></div>
             </div>
         </div>
     </div>
diff --git a/theme/boost/scss/moodle/filemanager.scss b/theme/boost/scss/moodle/filemanager.scss
index e10df1b88e0..77453f0d7eb 100644
--- a/theme/boost/scss/moodle/filemanager.scss
+++ b/theme/boost/scss/moodle/filemanager.scss
@@ -35,10 +35,6 @@
 .filepicker .moodle-dialogue-bd {
     min-height: 520px;
 }
-.file-picker .fp-navbar {
-    min-height: 40px;
-    padding: 4px;
-}
 
 .fp-navbar {
     border-color: $input-border-color;
diff --git a/theme/boost/style/moodle.css b/theme/boost/style/moodle.css
index 96536c54a9e..52acb02d2d9 100644
--- a/theme/boost/style/moodle.css
+++ b/theme/boost/style/moodle.css
@@ -30336,11 +30336,6 @@ body.drawer-ease {
   min-height: 520px;
 }
 
-.file-picker .fp-navbar {
-  min-height: 40px;
-  padding: 4px;
-}
-
 .fp-navbar {
   border-color: #8f959e;
   border-bottom: 0;
diff --git a/theme/classic/style/moodle.css b/theme/classic/style/moodle.css
index 11ce0804ce4..4f2f4f37d39 100644
--- a/theme/classic/style/moodle.css
+++ b/theme/classic/style/moodle.css
@@ -30336,11 +30336,6 @@ body.drawer-ease {
   min-height: 520px;
 }
 
-.file-picker .fp-navbar {
-  min-height: 40px;
-  padding: 4px;
-}
-
 .fp-navbar {
   border-color: #8f959e;
   border-bottom: 0;