diff --git a/chrome/content/zotero/xpcom/editorInstance.js b/chrome/content/zotero/xpcom/editorInstance.js
index bedee1af3a..ba0f2969e0 100644
--- a/chrome/content/zotero/xpcom/editorInstance.js
+++ b/chrome/content/zotero/xpcom/editorInstance.js
@@ -95,6 +95,10 @@ class EditorInstance {
 		
 		let note = this._item.note;
 
+		// TODO: From Firefox 64 this is no longer necessary
+		this._iframeWindow.document.execCommand('enableObjectResizing', false, 'false');
+		this._iframeWindow.document.execCommand('enableInlineTableEditing', false, 'false');
+
 		this._postMessage({
 			action: 'init',
 			value: this._state || this._item.note,
diff --git a/note-editor b/note-editor
index 7565a117a7..0d84a3ec10 160000
--- a/note-editor
+++ b/note-editor
@@ -1 +1 @@
-Subproject commit 7565a117a702023dad773e832e7f805dd37f1df2
+Subproject commit 0d84a3ec1028ac8f224a9167d44c76c35523e8eb
diff --git a/pdf-reader b/pdf-reader
index 04f474c5e2..9ba10b2e8e 160000
--- a/pdf-reader
+++ b/pdf-reader
@@ -1 +1 @@
-Subproject commit 04f474c5e2eee49e2837cd4106c3630674abe30c
+Subproject commit 9ba10b2e8e942a54e2652cc438a5da04f921556b