diff --git a/components/WeaponKeySelect/index.tsx b/components/WeaponKeySelect/index.tsx
index 53899b15..81609a75 100644
--- a/components/WeaponKeySelect/index.tsx
+++ b/components/WeaponKeySelect/index.tsx
@@ -56,7 +56,6 @@ const WeaponKeySelect = React.forwardRef<HTMLButtonElement, Props>(
 
       function fetchWeaponKeys() {
         api.endpoints.weapon_keys.getAll(filterParams).then((response) => {
-          const keys = response.data.map((k: any) => k.weapon_key)
           const keys = response.data
           organizeWeaponKeys(keys)
         })
@@ -125,9 +124,9 @@ const WeaponKeySelect = React.forwardRef<HTMLButtonElement, Props>(
     return (
       <Select
         key={`weapon-key-${props.slot}`}
-        defaultValue={props.currentValue ? props.currentValue.id : 'no-key'}
+        value={props.currentValue ? props.currentValue.id : 'no-key'}
         open={open}
-        onChange={handleChange}
+        onValueChange={handleChange}
         onClick={openSelect}
         ref={ref}
         triggerClass="modal"
diff --git a/components/WeaponModal/index.tsx b/components/WeaponModal/index.tsx
index cc83e9a7..40f08be0 100644
--- a/components/WeaponModal/index.tsx
+++ b/components/WeaponModal/index.tsx
@@ -7,6 +7,7 @@ import { AxiosResponse } from 'axios'
 import * as Dialog from '@radix-ui/react-dialog'
 
 import AXSelect from '~components/AxSelect'
+import AwakeningSelect from '~components/AwakeningSelect'
 import ElementToggle from '~components/ElementToggle'
 import WeaponKeySelect from '~components/WeaponKeySelect'
 import Button from '~components/Button'
@@ -16,7 +17,6 @@ import { appState } from '~utils/appState'
 
 import CrossIcon from '~public/icons/Cross.svg'
 import './index.scss'
-import AwakeningSelect from '~components/AwakeningSelect'
 
 interface GridWeaponObject {
   weapon: {
@@ -253,11 +253,16 @@ const WeaponModal = (props: Props) => {
   }
 
   function openChange(open: boolean) {
-    setFormValid(false)
+    if (props.gridWeapon.object.ax > 0 || props.gridWeapon.object.awakening) {
+      setFormValid(false)
+    } else {
+      setFormValid(true)
+    }
     setOpen(open)
   }
 
   return (
+    // TODO: Refactor into Dialog component
     <Dialog.Root open={open} onOpenChange={openChange}>
       <Dialog.Trigger asChild>{props.children}</Dialog.Trigger>
       <Dialog.Portal>