diff --git a/app/assets/stylesheets/common/base/personal-message.scss b/app/assets/stylesheets/common/base/personal-message.scss
index 6100b246617..9cd8daf0169 100644
--- a/app/assets/stylesheets/common/base/personal-message.scss
+++ b/app/assets/stylesheets/common/base/personal-message.scss
@@ -69,15 +69,6 @@
     }
   }
 
-  .topic-body.highlighted {
-    animation: none;
-    @media (prefers-reduced-motion: no-preference) {
-      .cooked {
-        animation: background-fade-highlight 2.5s ease-out;
-      }
-    }
-  }
-
   .topic-avatar,
   .topic-body {
     border: none;
diff --git a/app/assets/stylesheets/common/base/topic-post.scss b/app/assets/stylesheets/common/base/topic-post.scss
index bb8cea16835..89c1b190dd7 100644
--- a/app/assets/stylesheets/common/base/topic-post.scss
+++ b/app/assets/stylesheets/common/base/topic-post.scss
@@ -942,30 +942,24 @@ aside.quote {
     border-top: 1px solid var(--primary-low);
     padding-top: 0.5em;
   }
+}
 
-  @media (prefers-reduced-motion: no-preference) {
-    &.highlighted {
-      animation: background-fade-highlight 2.5s ease-out;
-    }
+@media (prefers-reduced-motion: no-preference) {
+  .topic-body.highlighted .cooked,
+  .small-action-desc.highlighted {
+    animation: background-fade-highlight 2.5s ease-out;
+  }
+  // Disable animation so deleted status is visible immediately
+  .deleted .topic-body.highlighted .cooked {
+    animation: none;
   }
 }
 
-.topic-body:not(.deleted),
-.small-action-desc {
-  @media (prefers-reduced-motion: no-preference) {
-    &.highlighted {
-      animation: background-fade-highlight 2.5s ease-out;
-    }
-  }
-  &.highlighted:focus-visible {
+.small-action-desc,
+.topic-body {
+  &:focus-visible {
     outline: none;
   }
-  .deleted & {
-    // Disable so the deleted background is visible immediately
-    &.highlighted {
-      animation: none;
-    }
-  }
 }
 
 .post-info {