diff --git a/chrome/content/zotero/xpcom/editorInstance.js b/chrome/content/zotero/xpcom/editorInstance.js
index 994143beea..9ca282858f 100644
--- a/chrome/content/zotero/xpcom/editorInstance.js
+++ b/chrome/content/zotero/xpcom/editorInstance.js
@@ -589,11 +589,15 @@ class EditorInstance {
 					if (!item) {
 						return;
 					}
-					let attachments = Zotero.Items.get(item.getAttachments()).filter(x => x.isPDFAttachment());
-					if (citationItem.locator && attachments.length === 1) {
-						let zp = Zotero.getActiveZoteroPane();
-						if (zp) {
-							zp.viewPDF(attachments[0].id, { pageLabel: citationItem.locator });
+
+					if (citationItem.locator) {
+						let attachments = await item.getBestAttachments();
+						attachments = attachments.filter(x => x.isPDFAttachment());
+						if (attachments.length) {
+							let zp = Zotero.getActiveZoteroPane();
+							if (zp) {
+								zp.viewPDF(attachments[0].id, { pageLabel: citationItem.locator });
+							}
 						}
 					}
 					else {
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index e7855f7712..ea446c7063 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -1333,10 +1333,13 @@ noteEditor.unlink = Unlink
 noteEditor.set = Set
 noteEditor.edit = Edit
 noteEditor.addCitation = Add Citation
+noteEditor.removeCitation = Hide Citation
 noteEditor.findAndReplace = Find and Replace
 noteEditor.editInWindow = Edit in a Separate Window
-noteEditor.applyAnnotationColors = Apply Annotation Colors
-noteEditor.removeAnnotationColors = Remove Annotation Colors
+noteEditor.applyAnnotationColors = Show Annotation Colors
+noteEditor.removeAnnotationColors = Hide Annotation Colors
+noteEditor.addCitations = Show Annotation Citations
+noteEditor.removeCitations = Hide Annotation Citations
 
 pdfReader.annotations = Annotations
 pdfReader.showAnnotations = Show Annotations
diff --git a/note-editor b/note-editor
index 2c986e46bb..6ba8de80ff 160000
--- a/note-editor
+++ b/note-editor
@@ -1 +1 @@
-Subproject commit 2c986e46bb790789d9416819c087bcfd566ad574
+Subproject commit 6ba8de80ff64558f7cc727355b69eaca0ae3dcad