From 0fec10c3ac4fe0b221e2f6c721cd6c5cc01a71c6 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 3 Aug 2021 12:30:15 +1000
Subject: [PATCH 1/3] Fix unset performer gender

---
 .../Performers/PerformerDetails/PerformerEditPanel.tsx          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
index b89cbbd8908..da024bb0e0f 100644
--- a/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
+++ b/ui/v2.5/src/components/Performers/PerformerDetails/PerformerEditPanel.tsx
@@ -466,7 +466,7 @@ export const PerformerEditPanel: React.FC<IPerformerDetails> = ({
   function getUpdateValues(values: InputValues): GQL.PerformerUpdateInput {
     return {
       ...values,
-      gender: stringToGender(values.gender),
+      gender: stringToGender(values.gender) ?? null,
       rating: values.rating ?? null,
       weight: Number(values.weight),
       id: performer.id ?? "",

From 3f196b89bfcb5522e062125ebe3d1487210afb94 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 3 Aug 2021 12:30:21 +1000
Subject: [PATCH 2/3] Add changelog entry

---
 ui/v2.5/src/components/Changelog/versions/v090.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/v2.5/src/components/Changelog/versions/v090.md b/ui/v2.5/src/components/Changelog/versions/v090.md
index cbb8b0f3ff4..b03c020e708 100644
--- a/ui/v2.5/src/components/Changelog/versions/v090.md
+++ b/ui/v2.5/src/components/Changelog/versions/v090.md
@@ -6,6 +6,7 @@
 * Added de-DE language option. ([#1578](https://github.com/stashapp/stash/pull/1578))
 
 ### 🐛 Bug fixes
+* Fix unsetting performer gender not working correctly. ([#1606](https://github.com/stashapp/stash/pull/1606))
 * Fix is missing date scene criterion causing invalid SQL. ([#1577](https://github.com/stashapp/stash/pull/1577))
 * Fix rendering of carousel images on Apple devices. ([#1562](https://github.com/stashapp/stash/pull/1562))
 * Show New and Delete buttons in mobile view. ([#1539](https://github.com/stashapp/stash/pull/1539))
\ No newline at end of file

From 16903a753345a5a674e7060003e9e9fa0e663e19 Mon Sep 17 00:00:00 2001
From: WithoutPants <53250216+WithoutPants@users.noreply.github.com>
Date: Tue, 3 Aug 2021 12:35:06 +1000
Subject: [PATCH 3/3] Fix button group appearing over select menu

---
 ui/v2.5/src/index.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 46acabbd749..58c81d61ca7 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -229,6 +229,7 @@ div.react-select__menu,
 div.dropdown-menu {
   background-color: $secondary;
   color: $text-color;
+  z-index: 3;
 
   .react-select__option,
   .dropdown-item {