diff --git a/app/soapbox/features/compose/components/compose_form.js b/app/soapbox/features/compose/components/compose_form.js
index 0f3f45f41..da9e142ab 100644
--- a/app/soapbox/features/compose/components/compose_form.js
+++ b/app/soapbox/features/compose/components/compose_form.js
@@ -166,8 +166,12 @@ class ComposeForm extends ImmutablePureComponent {
   }
 
   componentDidMount() {
+    const length = this.props.text.length;
     document.addEventListener('click', this.handleClick, true);
-    this.setCursor(this.props.text.length); // Set cursor at end
+
+    if (length > 0) {
+      this.setCursor(length); // Set cursor at end
+    }
   }
 
   componentWillUnmount() {