diff --git a/components/WeaponModal/index.tsx b/components/WeaponModal/index.tsx
index badb0f9e..5cec601c 100644
--- a/components/WeaponModal/index.tsx
+++ b/components/WeaponModal/index.tsx
@@ -97,8 +97,10 @@ const WeaponModal = ({
   const headerRef = React.createRef<HTMLDivElement>()
   const footerRef = React.createRef<HTMLDivElement>()
 
+  // Hooks
   useEffect(() => {
     setOpen(modalOpen)
+    handleOpenChange(modalOpen)
   }, [modalOpen])
 
   useEffect(() => {