diff --git a/src/components/Page/TextEditor.vue b/src/components/Page/TextEditor.vue
index fcafa062a..ef1c85971 100644
--- a/src/components/Page/TextEditor.vue
+++ b/src/components/Page/TextEditor.vue
@@ -227,20 +227,7 @@ export default {
 		 */
 		readyEditor() {
 			this.done('editor')
-
 			this.readMode = false
-
-			// Don't steal the focus from title if a new page
-			if (this.loading('newPage')) {
-				this.done('newPage')
-				return
-			}
-
-			if (this.isTextEdit) {
-				this.$nextTick(() => {
-					this.focusEditor()
-				})
-			}
 		},
 
 		initEditMode() {
@@ -249,10 +236,11 @@ export default {
 				// for template pages
 				|| this.isTemplatePage
 				// for new pages
-				|| this.loading('newPage')
+				|| this.loading('newPageContent')
 				// or when page is empty
 				|| !this.pageContent?.trim()) {
 				this.setTextEdit()
+				this.done('newPageContent')
 			}
 		},