diff --git a/src/cloak-mode.css b/src/cloak-mode.css
index 7a6c32d2..0b1e53b9 100644
--- a/src/cloak-mode.css
+++ b/src/cloak-mode.css
@@ -8,7 +8,7 @@ body.cloak,
   .name-text *,
   .status .content-container,
   .status .content-container *,
-  .status .content-compact,
+  .status .content-compact > *,
   .account-container :is(header, main > *:not(.actions)),
   .account-container :is(header, main > *:not(.actions)) *,
   .header-double-lines,
@@ -42,11 +42,16 @@ body.cloak,
 /* SPECIAL CASES */
 
 @supports (display: -webkit-box) {
-  body.cloak .card :is(.title, .meta) {
-    background-color: var(--text-color) !important;
+  :is(body.cloak, .cloak) .card :is(.title, .meta) {
+    background-color: currentColor !important;
   }
 }
 
-.catchup-filters .filter-author * {
-  color: var(--text-color);
+body.cloak,
+.cloak {
+  .media-container figcaption,
+  .media-container figcaption > *,
+  .catchup-filters .filter-author * {
+    color: currentColor !important;
+  }
 }
diff --git a/src/components/status.jsx b/src/components/status.jsx
index c196cee1..7dbc0b13 100644
--- a/src/components/status.jsx
+++ b/src/components/status.jsx
@@ -2441,7 +2441,7 @@ function StatusCompact({ sKey }) {
             <span>{filterTitleStr}</span>
           </b>
         ) : (
-          statusPeekText
+          <span>{statusPeekText}</span>
         )}
       </div>
     </article>