diff --git a/chrome/content/zotero/elements/tagsBox.js b/chrome/content/zotero/elements/tagsBox.js
index ee95743b51..96050557a3 100644
--- a/chrome/content/zotero/elements/tagsBox.js
+++ b/chrome/content/zotero/elements/tagsBox.js
@@ -64,26 +64,6 @@
 				removeAllItemTags.disabled = !this.count;
 				this._id('tags-context-menu').openPopupAtScreen(event.screenX, event.screenY, true);
 			});
-			
-			if (!document.getElementById('PopupAutoComplete')) {
-				let popupset = document.querySelector('popupset');
-				if (!popupset) {
-					popupset = document.createXULElement('popupset');
-					document.documentElement.append(popupset);
-				}
-				
-				let autocomplete = document.createXULElement('panel', { is: 'autocomplete-richlistbox-popup' });
-				autocomplete.id = 'PopupAutoComplete';
-				autocomplete.setAttribute('type', 'autocomplete-richlistbox');
-				autocomplete.setAttribute('role', 'group');
-				autocomplete.setAttribute('noautofocus', true);
-				autocomplete.setAttribute('hidden', true);
-				autocomplete.setAttribute('overflowpadding', 4);
-				autocomplete.setAttribute('norolluponanchor', true);
-				autocomplete.setAttribute('nomaxresults', true);
-				popupset.append(autocomplete);
-			}
-
 			// Register our observer with priority 101 (after Zotero.Tags) so we get updated tag colors
 			this._notifierID = Zotero.Notifier.registerObserver(this, ['item-tag', 'setting'], 'tagsBox', 101);
 		}
diff --git a/chrome/content/zotero/zoteroPane.xhtml b/chrome/content/zotero/zoteroPane.xhtml
index 5720f8ff89..6b9038ddf3 100644
--- a/chrome/content/zotero/zoteroPane.xhtml
+++ b/chrome/content/zotero/zoteroPane.xhtml
@@ -1305,4 +1305,18 @@
 			</stack>
 		</vbox>
 	</hbox>
+	<!-- fx115: the popupset has to be here to properly display autocomplete popup -->
+	<popupset>
+		<panel
+			is="autocomplete-richlistbox-popup"
+			type="autocomplete-richlistbox"
+			id="PopupAutoComplete"
+			role="group"
+			noautofocus="true"
+			hidden="true"
+			overflowpadding="4"
+			norolluponanchor="true"
+			nomaxresults="true"
+		/>
+	</popupset>
 </window>