diff --git a/ui/v2.5/src/components/Changelog/versions/v050.md b/ui/v2.5/src/components/Changelog/versions/v050.md
index 2d625495d..a1fb43ced 100644
--- a/ui/v2.5/src/components/Changelog/versions/v050.md
+++ b/ui/v2.5/src/components/Changelog/versions/v050.md
@@ -21,6 +21,7 @@
 * Support configurable number of threads for scanning and generation.
 
 ### 🐛 Bug fixes
+* Fixed performer scraper select overlapping search results
 * Fix tag/studio images not being changed after update.
 * Fixed resolution tags and querying for portrait videos and images.
 * Corrected file sizes on 32bit platforms
diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
index 12dbac8aa..c31bc17c1 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerDetailsPanel.tsx
@@ -397,9 +397,9 @@ export const PerformerDetailsPanel: React.FC<IPerformerDetails> = ({
     }
 
     const popover = (
-      <Popover id="scraper-popover">
+      <Popover id="performer-scraper-popover">
         <Popover.Content>
-          <div>
+          <>
             {queryableScrapers
               ? queryableScrapers.map((s) => (
                   <div key={s.name}>
@@ -421,7 +421,7 @@ export const PerformerDetailsPanel: React.FC<IPerformerDetails> = ({
                 <span>Reload scrapers</span>
               </Button>
             </div>
-          </div>
+          </>
         </Popover.Content>
       </Popover>
     );
diff --git a/ui/v2.5/src/components/Performers/styles.scss b/ui/v2.5/src/components/Performers/styles.scss
index d5d1df7b4..6cf3e3254 100644
--- a/ui/v2.5/src/components/Performers/styles.scss
+++ b/ui/v2.5/src/components/Performers/styles.scss
@@ -88,3 +88,7 @@
   margin-top: 10px;
   max-width: 100%;
 }
+
+#performer-scraper-popover {
+  z-index: 1;
+}
diff --git a/ui/v2.5/src/components/Shared/Select.tsx b/ui/v2.5/src/components/Shared/Select.tsx
index b0c4d2318..a3afe491f 100644
--- a/ui/v2.5/src/components/Shared/Select.tsx
+++ b/ui/v2.5/src/components/Shared/Select.tsx
@@ -63,6 +63,7 @@ interface ISelectProps {
   showDropdown?: boolean;
   groupHeader?: string;
   closeMenuOnSelect?: boolean;
+  noOptionsMessage?: string | null;
 }
 interface IFilterComponentProps extends IFilterProps {
   items: Array<ValidTypes>;
@@ -106,6 +107,7 @@ const SelectComponent: React.FC<ISelectProps & ITypeProps> = ({
   showDropdown = true,
   groupHeader,
   closeMenuOnSelect = true,
+  noOptionsMessage = type !== "tags" ? "None" : null,
 }) => {
   const defaultValue =
     items.filter((item) => initialIds?.indexOf(item.value) !== -1) ?? null;
@@ -143,7 +145,7 @@ const SelectComponent: React.FC<ISelectProps & ITypeProps> = ({
     isMulti,
     isClearable,
     defaultValue,
-    noOptionsMessage: () => (type !== "tags" ? "None" : null),
+    noOptionsMessage: () => noOptionsMessage,
     placeholder: isDisabled ? "" : placeholder,
     onInputChange,
     isDisabled,
@@ -312,6 +314,7 @@ export const ScrapePerformerSuggest: React.FC<IScrapePerformerSuggestProps> = (
       placeholder={props.placeholder}
       className="select-suggest"
       showDropdown={false}
+      noOptionsMessage={query === "" ? null : "No performers found."}
     />
   );
 };