diff --git a/app/assets/stylesheets/lexxy.css b/app/assets/stylesheets/lexxy.css
index 51b24d91e..8b4b63d6b 100644
--- a/app/assets/stylesheets/lexxy.css
+++ b/app/assets/stylesheets/lexxy.css
@@ -24,6 +24,7 @@
   }
 
   .lexxy-content__table-wrapper {
+    margin: 0;
     margin-block: 1ch;
     overflow-x: auto;
   }
diff --git a/app/assets/stylesheets/rich-text-content.css b/app/assets/stylesheets/rich-text-content.css
index 7c979928c..bf5328478 100644
--- a/app/assets/stylesheets/rich-text-content.css
+++ b/app/assets/stylesheets/rich-text-content.css
@@ -211,11 +211,12 @@
     }
 
     /* Tables */
-    .table-wrapper {
+    .lexxy-content__table-wrapper {
+      margin: 0;
       margin-block: 1ch;
       overflow-x: auto;
     }
-    
+
     table {
       border-collapse: collapse;
       border-spacing: 0;
@@ -232,6 +233,10 @@
         *:last-child {
           margin-block-end: 0;
         }
+
+        *:not(pre, code) {
+          word-break: normal;
+        }
       }
   
       th,