diff --git a/chrome/content/zotero/note.js b/chrome/content/zotero/note.js
index 57dd995898..25d7458f56 100644
--- a/chrome/content/zotero/note.js
+++ b/chrome/content/zotero/note.js
@@ -29,7 +29,6 @@ var notifierUnregisterID;
 async function onLoad() {
 	noteEditor = document.getElementById('zotero-note-editor');
 	noteEditor.mode = 'edit';
-	noteEditor.focus();
 	
 	// Set font size from pref
 	Zotero.setFontSize(noteEditor);
diff --git a/resource/tinymce/note.html b/resource/tinymce/note.html
index 003bbe05e3..b62c42ba17 100644
--- a/resource/tinymce/note.html
+++ b/resource/tinymce/note.html
@@ -10,6 +10,7 @@
 		body_id: "zotero-tinymce-note",
 		content_css: "css/note-content.css",
 		
+		auto_focus: "tinymce",
 		browser_spellcheck: true,
 		convert_urls: false,
 		entity_encoding: 'raw',