diff --git a/changelog.d/fix-wrap.skip b/changelog.d/fix-wrap.skip
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/components/post_status_form/post_status_form.scss b/src/components/post_status_form/post_status_form.scss
index 9e8de25d5..a79cae4a6 100644
--- a/src/components/post_status_form/post_status_form.scss
+++ b/src/components/post_status_form/post_status_form.scss
@@ -205,6 +205,7 @@
     min-height: calc(var(--post-line-height) * 1em);
     resize: none;
     background: transparent;
+    text-wrap: stable;
 
     &.scrollable-form {
       overflow-y: auto;
diff --git a/src/components/status/status.scss b/src/components/status/status.scss
index e43617ecd..9a2885122 100644
--- a/src/components/status/status.scss
+++ b/src/components/status/status.scss
@@ -92,8 +92,10 @@
 
     a {
       display: inline-block;
-      overflow-wrap: break-word;
-      text-wrap: pretty;
+      white-space: nowrap;
+      text-overflow: ellipsis;
+      overflow-x: hidden;
+      width: 100%
     }
   }
 
@@ -101,6 +103,7 @@
     min-width: 1.6em;
     margin-right: 0.4em;
     white-space: nowrap;
+    overflow-wrap: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
     flex: 1 1 0;
diff --git a/src/components/status_body/status_body.scss b/src/components/status_body/status_body.scss
index 32a2502fc..18d38827c 100644
--- a/src/components/status_body/status_body.scss
+++ b/src/components/status_body/status_body.scss
@@ -54,7 +54,7 @@
 
   .text-wrapper {
     text-overflow: ellipsis;
-    word-break: break-word;
+    overflow-wrap: break-word;
     overflow: hidden;
     display: flex;
     flex-flow: column nowrap;