diff --git a/mod/folder/renderer.php b/mod/folder/renderer.php
index ee251cdad41..c48bda98810 100644
--- a/mod/folder/renderer.php
+++ b/mod/folder/renderer.php
@@ -61,8 +61,9 @@ class mod_folder_renderer extends plugin_renderer_base {
             // Display module name as the name of the root directory.
             $foldertree->dir['dirname'] = $cm->get_formatted_name(array('escape' => false));
         }
-        $output .= $this->output->box($this->render($foldertree),
-                'generalbox foldertree');
+        $output .= $this->output->container_start("box generalbox pt-0 pb-3 foldertree");
+        $output .= $this->render($foldertree);
+        $output .= $this->output->container_end();
 
         // Do not append the edit button on the course page.
         $downloadable = folder_archive_available($folder, $cm);
@@ -91,7 +92,9 @@ class mod_folder_renderer extends plugin_renderer_base {
         }
 
         if ($buttons) {
-            $output .= $this->output->box($buttons, 'generalbox folderbuttons');
+            $output .= $this->output->container_start("box generalbox pt-0 pb-3 folderbuttons");
+            $output .= $buttons;
+            $output .= $this->output->container_end();
         }
 
         return $output;