diff --git a/chrome/content/zotero/xpcom/editorInstance.js b/chrome/content/zotero/xpcom/editorInstance.js
index ef383f74a9..235ccdf199 100644
--- a/chrome/content/zotero/xpcom/editorInstance.js
+++ b/chrome/content/zotero/xpcom/editorInstance.js
@@ -120,6 +120,7 @@ class EditorInstance {
 			dir: Zotero.dir,
 			font: this._getFont(),
 			style,
+			smartQuotes: Zotero.Prefs.get('note.smartQuotes'),
 			localizedStrings: {
 				// Figure out a better way to pass this
 				'zotero.appName': Zotero.appName,
diff --git a/defaults/preferences/zotero.js b/defaults/preferences/zotero.js
index 01e1554e72..a984863f3b 100644
--- a/defaults/preferences/zotero.js
+++ b/defaults/preferences/zotero.js
@@ -101,6 +101,7 @@ pref("extensions.zotero.search.useLeftBound", true);
 pref("extensions.zotero.note.fontFamily", "Lucida Grande, Tahoma, Verdana, Helvetica, sans-serif");
 pref("extensions.zotero.note.fontSize", "14");
 pref("extensions.zotero.note.css", "");
+pref("extensions.zotero.note.smartQuotes", true);
 
 // Reports
 pref("extensions.zotero.report.includeAllChildItems", true);
diff --git a/note-editor b/note-editor
index 55b26f9a88..4225b6b2cf 160000
--- a/note-editor
+++ b/note-editor
@@ -1 +1 @@
-Subproject commit 55b26f9a88944a684d2ecce7b54ffab4c52454f4
+Subproject commit 4225b6b2cfb175daacf47cd88b0c206b4f71981f