diff --git a/app/scenes/Document/components/Document.js b/app/scenes/Document/components/Document.js
index e316a24b4..52a16b022 100644
--- a/app/scenes/Document/components/Document.js
+++ b/app/scenes/Document/components/Document.js
@@ -345,7 +345,7 @@ class DocumentScene extends React.Component<Props> {
                   )}
                 </Notice>
               )}
-              <Flex>
+              <Flex auto={!readOnly}>
                 {ui.tocVisible &&
                   readOnly && <Contents document={revision || document} />}
                 <Editor
diff --git a/app/scenes/Document/components/Editor.js b/app/scenes/Document/components/Editor.js
index 8abc11c49..2253aca57 100644
--- a/app/scenes/Document/components/Editor.js
+++ b/app/scenes/Document/components/Editor.js
@@ -25,12 +25,6 @@ type Props = {|
 class DocumentEditor extends React.Component<Props> {
   editor: ?Editor;
 
-  componentDidMount() {
-    if (this.props.title) {
-      setImmediate(this.focusAtStart);
-    }
-  }
-
   focusAtStart = () => {
     if (this.editor) {
       this.editor.focusAtStart();