diff --git a/css/main.css b/css/main.css
index 30c0d5f5..7cc496a7 100644
--- a/css/main.css
+++ b/css/main.css
@@ -1802,8 +1802,7 @@ table {
     border-collapse: collapse;
 }
 
-.message-body table {
-    display: block;
+.table-wrapper {
     overflow-x: auto;
 }
 
diff --git a/modules/html_generator.py b/modules/html_generator.py
index f3811602..138d4ade 100644
--- a/modules/html_generator.py
+++ b/modules/html_generator.py
@@ -317,6 +317,9 @@ def process_markdown_content(string):
     # Unescape backslashes
     html_output = html_output.replace('\\\\', '\\')
 
+    # Wrap tables in a scrollable div
+    html_output = html_output.replace('<table>', '<div class="table-wrapper pretty_scrollbar"><table>').replace('</table>', '</table></div>')
+
     return html_output