diff --git a/dapp/src/components/Overview/PositionDetails.tsx b/dapp/src/components/Overview/PositionDetails.tsx
index ea5dcdb17..903972f27 100644
--- a/dapp/src/components/Overview/PositionDetails.tsx
+++ b/dapp/src/components/Overview/PositionDetails.tsx
@@ -36,7 +36,9 @@ export default function PositionDetails(props: CardProps) {
       </CardBody>
       <CardFooter flexDirection="column" gap={2}>
         {/* TODO: Handle click actions */}
-        <Button size="lg" onClick={() => setIsOpenStakingModal(true)}>Stake</Button>
+        <Button size="lg" onClick={() => setIsOpenStakingModal(true)}>
+          Stake
+        </Button>
         <Button size="lg" variant="outline">
           Unstake
         </Button>
diff --git a/dapp/src/components/shared/ModalBase/index.tsx b/dapp/src/components/shared/ModalBase/index.tsx
index 8e454c3b5..6ad40c6d9 100644
--- a/dapp/src/components/shared/ModalBase/index.tsx
+++ b/dapp/src/components/shared/ModalBase/index.tsx
@@ -14,6 +14,7 @@ export default function ModalBase({
   isOpen: boolean
   onClose: () => void
   steps: string[]
+  // eslint-disable-next-line react/require-default-props
   defaultIndex?: number
   children: React.ReactNode
 }) {
@@ -30,6 +31,11 @@ export default function ModalBase({
     onClose()
   }, [onClose])
 
+  const resetState = useCallback(() => {
+    setActiveStep(steps[defaultIndex])
+    setIndex(defaultIndex)
+  }, [defaultIndex, steps])
+
   useEffect(() => {
     if (index >= steps.length) {
       handleClose()
@@ -39,18 +45,16 @@ export default function ModalBase({
   }, [steps, index, handleClose])
 
   useEffect(() => {
-    if (!isOpen) {
-      closeSidebar()
+    let timeout: NodeJS.Timeout
 
-      const timeout = setTimeout(() => {
-        setActiveStep(steps[defaultIndex])
-        setIndex(defaultIndex)
-      }, 100)
-      return () => clearTimeout(timeout)
-    } else {
+    if (isOpen) {
       openSideBar()
+    } else {
+      closeSidebar()
+      timeout = setTimeout(resetState, 100)
     }
-  }, [isOpen, steps, defaultIndex, closeSidebar, openSideBar])
+    return () => clearTimeout(timeout)
+  }, [isOpen, resetState, openSideBar, closeSidebar])
 
   const contextValue: ModalFlowContextValue = useMemo<ModalFlowContextValue>(
     () => ({