diff --git a/src/components/status.css b/src/components/status.css
index caf5a297..f96762b7 100644
--- a/src/components/status.css
+++ b/src/components/status.css
@@ -535,6 +535,13 @@
   color: var(--text-color);
   text-decoration-color: var(--link-color);
 }
+.status .content :is(.h-card, .mention) {
+  unicode-bidi: isolate;
+}
+.status .spoiler-content > *,
+.status .content .inner-content > * {
+  unicode-bidi: plaintext;
+}
 .status .content p {
   /* 12px = 75% of 16px */
   margin-block: min(0.75em, 12px);
diff --git a/src/components/status.jsx b/src/components/status.jsx
index c89ab95c..21c3877d 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -1045,7 +1045,7 @@ function Status({
           {!!spoilerText && (
             <>
               <div
-                class="content"
+                class="content spoiler-content"
                 lang={language}
                 dir="auto"
                 ref={spoilerContentRef}
@@ -1073,14 +1073,10 @@ function Status({
               </button>
             </>
           )}
-          <div
-            class="content"
-            lang={language}
-            dir="auto"
-            ref={contentRef}
-            data-read-more={readMoreText}
-          >
+          <div class="content" ref={contentRef} data-read-more={readMoreText}>
             <div
+              lang={language}
+              dir="auto"
               class="inner-content"
               onClick={handleContentLinks({ mentions, instance, previewMode })}
               dangerouslySetInnerHTML={{