diff --git a/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt b/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt
index 8ceec49ce..c34eaab63 100644
--- a/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt
+++ b/app/src/main/java/app/pachli/components/compose/ComposeActivity.kt
@@ -396,12 +396,12 @@ class ComposeActivity :
     }
 
     private fun setupContentWarningField(startingContentWarning: String?) {
-        if (startingContentWarning != null) {
-            binding.composeContentWarningField.setText(startingContentWarning)
-        }
         binding.composeContentWarningField.doOnTextChanged { newContentWarning, _, _, _ ->
             viewModel.onContentWarningChanged(newContentWarning?.toString() ?: "")
         }
+        if (startingContentWarning != null) {
+            binding.composeContentWarningField.setText(startingContentWarning)
+        }
     }
 
     private fun setupComposeField(