diff --git a/chrome/content/zotero/containers/tagSelectorContainer.jsx b/chrome/content/zotero/containers/tagSelectorContainer.jsx
index 57ca342c6d..68ea5ca6f1 100644
--- a/chrome/content/zotero/containers/tagSelectorContainer.jsx
+++ b/chrome/content/zotero/containers/tagSelectorContainer.jsx
@@ -508,9 +508,10 @@ Zotero.TagSelector = class TagSelectorContainer extends React.PureComponent {
 			tagContextMenu.childNodes[i].disabled = this.state.viewOnly;
 		}
 		ev.preventDefault();
+		
 		tagContextMenu.openPopupAtScreen(
-			window.screenX + ev.clientX + 2,
-			window.screenY + ev.clientY + 2,
+			ev.screenX + 1,
+			ev.screenY + 1,
 			true
 		);
 		this.contextTag = tag;
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index c04842b27e..c95678db6f 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -1225,6 +1225,49 @@
 							<menuseparator/>
 							<menuitem id="context-pane-list-move-to-trash" label="&zotero.general.moveToTrash;"/>
 						</menupopup>
+						<!-- Tag Selector -->
+						<menupopup id="tag-menu">
+							<menuitem label="&zotero.tagSelector.assignColor;"
+								oncommand="ZoteroPane.tagSelector.openColorPickerWindow(); event.stopPropagation();"/>
+							<menuitem label="&zotero.tagSelector.renameTag;"
+								oncommand="ZoteroPane.tagSelector.openRenamePrompt(); event.stopPropagation();"/>
+							<menuitem label="&zotero.tagSelector.deleteTag;"
+								oncommand="ZoteroPane.tagSelector.openDeletePrompt(); event.stopPropagation();"/>
+						</menupopup>
+						<menupopup id="tag-selector-view-settings-menu"
+							onpopupshowing="
+								document.getElementById('show-automatic').setAttribute('checked', ZoteroPane.tagSelector.showAutomatic);
+								document.getElementById('display-all-tags').setAttribute('checked', ZoteroPane.tagSelector.displayAllTags);
+								document.getElementById('num-selected').label = ZoteroPane.tagSelector.label;
+								(async function () {
+									var libraryID = ZoteroPane.tagSelector.libraryID;
+									var library = Zotero.Libraries.get(libraryID);
+									var enabled = false;
+									if (library.editable) {
+										if ((await Zotero.Tags.getAutomaticInLibrary(libraryID)).length) {
+											enabled = true;
+										}
+									}
+									document.getElementById('delete-automatic-tags').disabled = !enabled;
+								})();">
+							<menuitem id="num-selected" disabled="true"/>
+							<menuitem id="deselect-all" label="&zotero.tagSelector.clearAll;"
+								oncommand="ZoteroPane.tagSelector.deselectAll(); event.stopPropagation();"/>
+							<menuseparator/>
+							<menuitem id="show-automatic" label="&zotero.tagSelector.showAutomatic;" type="checkbox"
+								oncommand="ZoteroPane.tagSelector.toggleShowAutomatic(); event.stopPropagation();"/>
+							<menuitem
+								id="display-all-tags"
+								label="&zotero.tagSelector.displayAllInLibrary;"
+								type="checkbox"
+								oncommand="ZoteroPane.tagSelector.toggleDisplayAllTags(); event.stopPropagation();"
+							/>
+							<menuseparator/>
+							<menuitem id="delete-automatic-tags" label="&zotero.tagSelector.deleteAutomaticInLibrary;" type="checkbox"
+														oncommand="ZoteroPane.tagSelector.deleteAutomatic();
+															this.setAttribute('checked', false);
+															event.stopPropagation();"/>
+						</menupopup>
 					</popupset>
 				</hbox>
 				
@@ -1252,48 +1295,4 @@
 			</stack>
 		</vbox>
 	</hbox>
-	
-	<!-- Tag Selector -->
-	<menupopup id="tag-menu">
-		<menuitem label="&zotero.tagSelector.assignColor;"
-			oncommand="ZoteroPane.tagSelector.openColorPickerWindow(); event.stopPropagation();"/>
-		<menuitem label="&zotero.tagSelector.renameTag;"
-			oncommand="ZoteroPane.tagSelector.openRenamePrompt(); event.stopPropagation();"/>
-		<menuitem label="&zotero.tagSelector.deleteTag;"
-			oncommand="ZoteroPane.tagSelector.openDeletePrompt(); event.stopPropagation();"/>
-	</menupopup>
-	<menupopup id="tag-selector-view-settings-menu"
-		onpopupshowing="
-			document.getElementById('show-automatic').setAttribute('checked', ZoteroPane.tagSelector.showAutomatic);
-			document.getElementById('display-all-tags').setAttribute('checked', ZoteroPane.tagSelector.displayAllTags);
-			document.getElementById('num-selected').label = ZoteroPane.tagSelector.label;
-			(async function () {
-				var libraryID = ZoteroPane.tagSelector.libraryID;
-				var library = Zotero.Libraries.get(libraryID);
-				var enabled = false;
-				if (library.editable) {
-					if ((await Zotero.Tags.getAutomaticInLibrary(libraryID)).length) {
-						enabled = true;
-					}
-				}
-				document.getElementById('delete-automatic-tags').disabled = !enabled;
-			})();">
-		<menuitem id="num-selected" disabled="true"/>
-		<menuitem id="deselect-all" label="&zotero.tagSelector.clearAll;"
-			oncommand="ZoteroPane.tagSelector.deselectAll(); event.stopPropagation();"/>
-		<menuseparator/>
-		<menuitem id="show-automatic" label="&zotero.tagSelector.showAutomatic;" type="checkbox"
-			oncommand="ZoteroPane.tagSelector.toggleShowAutomatic(); event.stopPropagation();"/>
-		<menuitem
-			id="display-all-tags"
-			label="&zotero.tagSelector.displayAllInLibrary;"
-			type="checkbox"
-			oncommand="ZoteroPane.tagSelector.toggleDisplayAllTags(); event.stopPropagation();"
-		/>
-		<menuseparator/>
-		<menuitem id="delete-automatic-tags" label="&zotero.tagSelector.deleteAutomaticInLibrary;" type="checkbox"
-									oncommand="ZoteroPane.tagSelector.deleteAutomatic();
-										this.setAttribute('checked', false);
-										event.stopPropagation();"/>
-	</menupopup>
 </window>