diff --git a/ui/v2.5/src/components/Tags/TagSelect.tsx b/ui/v2.5/src/components/Tags/TagSelect.tsx
index 64a58d121..18f667cba 100644
--- a/ui/v2.5/src/components/Tags/TagSelect.tsx
+++ b/ui/v2.5/src/components/Tags/TagSelect.tsx
@@ -54,13 +54,13 @@ function sortTagsByRelevance(input: string, tags: FindTagsResult) {
 
 const tagSelectSort = PatchFunction("TagSelect.sort", sortTagsByRelevance);
 
-const _TagSelect: React.FC<
-  IFilterProps &
-    IFilterValueProps<Tag> & {
-      hoverPlacement?: Placement;
-      excludeIds?: string[];
-    }
-> = (props) => {
+export type TagSelectProps = IFilterProps &
+  IFilterValueProps<Tag> & {
+    hoverPlacement?: Placement;
+    excludeIds?: string[];
+  };
+
+const _TagSelect: React.FC<TagSelectProps> = (props) => {
   const [createTag] = useTagCreate();
 
   const { configuration } = React.useContext(ConfigurationContext);
diff --git a/ui/v2.5/src/hooks/tagsEdit.tsx b/ui/v2.5/src/hooks/tagsEdit.tsx
index e44582911..73d6c951d 100644
--- a/ui/v2.5/src/hooks/tagsEdit.tsx
+++ b/ui/v2.5/src/hooks/tagsEdit.tsx
@@ -1,7 +1,7 @@
 import * as GQL from "src/core/generated-graphql";
 import { useTagCreate } from "src/core/StashService";
 import { useEffect, useState } from "react";
-import { Tag, TagSelect } from "src/components/Tags/TagSelect";
+import { Tag, TagSelect, TagSelectProps } from "src/components/Tags/TagSelect";
 import { useToast } from "src/hooks/Toast";
 import { useIntl } from "react-intl";
 import { Badge, Button } from "react-bootstrap";
@@ -125,15 +125,10 @@ export function useTagsEdit(
     return ret;
   }
 
-  function tagsControl() {
+  function tagsControl(props?: TagSelectProps) {
     return (
       <>
-        <TagSelect
-          menuPortalTarget={document.body}
-          isMulti
-          onSelect={onSetTags}
-          values={tags}
-        />
+        <TagSelect isMulti onSelect={onSetTags} values={tags} {...props} />
         {renderNewTags()}
       </>
     );