diff --git a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
index 7a694a09..ef763920 100644
--- a/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
+++ b/app/src/main/java/com/keylesspalace/tusky/adapter/StatusBaseViewHolder.java
@@ -124,6 +124,10 @@ public abstract class StatusBaseViewHolder extends RecyclerView.ViewHolder {
         username.setText(usernameText);
     }
 
+    public void toggleContentWarning() {
+        contentWarningButton.toggle();
+    }
+
     protected void setSpoilerAndContent(boolean expanded,
                                         @NonNull Spanned content,
                                         @Nullable String spoilerText,
diff --git a/app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt b/app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt
index e614b78c..cc86631a 100644
--- a/app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/util/ListStatusAccessibilityDelegate.kt
@@ -15,6 +15,7 @@ import androidx.core.view.accessibility.AccessibilityNodeInfoCompat.Accessibilit
 import androidx.recyclerview.widget.RecyclerView
 import androidx.recyclerview.widget.RecyclerViewAccessibilityDelegate
 import com.keylesspalace.tusky.R
+import com.keylesspalace.tusky.adapter.StatusBaseViewHolder
 import com.keylesspalace.tusky.interfaces.StatusActionListener
 import com.keylesspalace.tusky.viewdata.StatusViewData
 
@@ -115,7 +116,10 @@ class ListStatusAccessibilityDelegate(
                     statusActionListener.onViewMedia(pos, 3, null)
                 }
                 R.id.action_expand_cw -> {
-                    statusActionListener.onExpandedChange(true, pos)
+                    // Toggling it directly to avoid animations
+                    // which cannot be disabled for detaild status for some reason
+                    val holder = recyclerView.getChildViewHolder(host) as StatusBaseViewHolder
+                    holder.toggleContentWarning()
                     // Stop and restart narrator before it reads old description.
                     // Would be nice if we could *just* read the content here but doesn't seem
                     // to be possible.