diff --git a/components/WeaponModal/index.tsx b/components/WeaponModal/index.tsx
index 5f582189..4296ce0c 100644
--- a/components/WeaponModal/index.tsx
+++ b/components/WeaponModal/index.tsx
@@ -93,8 +93,10 @@ const WeaponModal = ({
   const [ax2Open, setAx2Open] = useState(false)
   const [awakeningOpen, setAwakeningOpen] = useState(false)
 
+  // Hooks
   useEffect(() => {
     setOpen(modalOpen)
+    handleOpenChange(modalOpen)
   }, [modalOpen])
 
   useEffect(() => {
@@ -346,7 +348,6 @@ const WeaponModal = ({
   }
 
   return (
-    // TODO: Refactor into Dialog component
     <Dialog open={open} onOpenChange={handleOpenChange}>
       <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent