diff --git a/mod/forum/templates/discussion_list.mustache b/mod/forum/templates/discussion_list.mustache
index bc379943683..b37e364f3f7 100644
--- a/mod/forum/templates/discussion_list.mustache
+++ b/mod/forum/templates/discussion_list.mustache
@@ -93,7 +93,8 @@
             {{{ pagination }}}
         {{/discussion_top_pagination}}
         {{$discussion_list_output}}
-            <table class="table discussion-list">
+        <div class="no-overflow">
+            <table class="table discussion-list generaltable">
                 <caption id="discussion-table-description-{{uniqid}}" class="sr-only">
                     {{#str}} showingcountoftotaldiscussions, mod_forum, {"count": "{{visiblediscussioncount}}", "total":"{{totaldiscussioncount}}"} {{/str}}
                 </caption>
@@ -355,6 +356,7 @@
                 </tbody>
                 {{/discussion_list_body}}
             </table>
+	</div>
         {{/discussion_list_output}}
         {{$discussion_bottom_pagination}}
             {{{ pagination }}}
diff --git a/mod/forum/templates/forum_discussion.mustache b/mod/forum/templates/forum_discussion.mustache
index f3e05a31f69..fed8dcdf793 100644
--- a/mod/forum/templates/forum_discussion.mustache
+++ b/mod/forum/templates/forum_discussion.mustache
@@ -45,7 +45,7 @@
 {{#html}}
     {{{neighbourlinks}}}
 
-    <div class="d-flex flex-row mb-1">
+    <div class="d-flex flex-column flex-sm-row mb-1">
         <div>{{{exportdiscussion}}}</div>
         <div class="{{#exportdiscussion}}ml-2{{/exportdiscussion}}">{{{modeselectorform}}}</div>
         <div class="ml-2">{{{movediscussion}}}</div>
@@ -111,4 +111,4 @@ function(
             });
     });
 });
-{{/js}}
\ No newline at end of file
+{{/js}}