diff --git a/frontend/components/Editor/Editor.js b/frontend/components/Editor/Editor.js
index 025e5a03..36a2374a 100644
--- a/frontend/components/Editor/Editor.js
+++ b/frontend/components/Editor/Editor.js
@@ -61,6 +61,12 @@ type KeyData = {
     }
   }
 
+  componentDidUpdate(prevProps: Props) {
+    if (prevProps.readOnly && !this.props.readOnly) {
+      this.focusAtEnd();
+    }
+  }
+
   getChildContext() {
     return { starred: this.props.starred };
   }