diff --git a/chrome/content/zotero/bindings/styled-textbox.xml b/chrome/content/zotero/bindings/styled-textbox.xml
index dcb35ae1e..22c487ea8 100644
--- a/chrome/content/zotero/bindings/styled-textbox.xml
+++ b/chrome/content/zotero/bindings/styled-textbox.xml
@@ -709,8 +709,10 @@
 									self.value = self._value;
 								}
 								if (self._focus) {
-									self._iframe.focus();
-									self._editor.focus();
+									setTimeout(function () {
+										self._iframe.focus();
+										self._editor.focus();
+									});
 									self._focus = false;
 								}
 								
diff --git a/chrome/content/zotero/note.js b/chrome/content/zotero/note.js
index 2240e01b5..aa5cd6dc9 100644
--- a/chrome/content/zotero/note.js
+++ b/chrome/content/zotero/note.js
@@ -70,6 +70,7 @@ async function onLoad() {
 		noteEditor.refresh();
 	}
 	
+	noteEditor.focus();
 	notifierUnregisterID = Zotero.Notifier.registerObserver(NotifyCallback, 'item', 'noteWindow');
 }
 
diff --git a/resource/tinymce/note.html b/resource/tinymce/note.html
index b62c42ba1..003bbe05e 100644
--- a/resource/tinymce/note.html
+++ b/resource/tinymce/note.html
@@ -10,7 +10,6 @@
 		body_id: "zotero-tinymce-note",
 		content_css: "css/note-content.css",
 		
-		auto_focus: "tinymce",
 		browser_spellcheck: true,
 		convert_urls: false,
 		entity_encoding: 'raw',