diff --git a/frontend-react/src/components/analyzer/EditableBuilds.tsx b/frontend-react/src/components/analyzer/EditableBuilds.tsx
index 9ac2494e7..42e053340 100644
--- a/frontend-react/src/components/analyzer/EditableBuilds.tsx
+++ b/frontend-react/src/components/analyzer/EditableBuilds.tsx
@@ -160,7 +160,12 @@ const EditableBuilds: React.FC<EditableBuildsProps> = ({
     <>
       <Button
         icon={showOther ? FaMinus : FaPlus}
-        onClick={() => setShowOther(!showOther)}
+        onClick={() => {
+          if (showOther && otherFocused) {
+            changeFocus()
+          }
+          setShowOther(!showOther)
+        }}
         mt="1em"
         mb="2em"
       >