diff --git a/app/soapbox/features/compose/components/compose-form.tsx b/app/soapbox/features/compose/components/compose-form.tsx
index ad67ff5d5..74517b162 100644
--- a/app/soapbox/features/compose/components/compose-form.tsx
+++ b/app/soapbox/features/compose/components/compose-form.tsx
@@ -215,7 +215,7 @@ const ComposeForm = <ID extends string>({ id, shouldCondense, autoFocus, clickab
   }, []);
 
   useEffect(() => {
-    if (firstRender.current) {
+    if (spoiler && firstRender.current) {
       focusTextarea();
       firstRender.current = false;
     } else if (!spoiler && prevSpoiler) {