diff --git a/frontend/src/pages/organization/SettingsPage/components/ImportTab/components/SelectImportFromPlatformModal.tsx b/frontend/src/pages/organization/SettingsPage/components/ImportTab/components/SelectImportFromPlatformModal.tsx
index 3dfbd9b7b..06631ffe1 100644
--- a/frontend/src/pages/organization/SettingsPage/components/ImportTab/components/SelectImportFromPlatformModal.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/ImportTab/components/SelectImportFromPlatformModal.tsx
@@ -45,7 +45,7 @@ export const SelectImportFromPlatformModal = ({ isOpen, onToggle }: Props) => {
         }
         className="my-4"
       >
-        <AnimatePresence exitBeforeEnter>
+        <AnimatePresence mode="wait">
           {wizardStep === WizardSteps.SelectPlatform && (
             <motion.div
               key="select-type-step"
diff --git a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/CreateDynamicSecretForm.tsx b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/CreateDynamicSecretForm.tsx
index 82009353c..c8389fb38 100644
--- a/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/CreateDynamicSecretForm.tsx
+++ b/frontend/src/pages/secret-manager/SecretDashboardPage/components/ActionBar/CreateDynamicSecretForm/CreateDynamicSecretForm.tsx
@@ -148,7 +148,7 @@ export const CreateDynamicSecretForm = ({
         subTitle="Configure dynamic secret parameters"
         className="my-4 max-w-3xl"
       >
-        <AnimatePresence exitBeforeEnter>
+        <AnimatePresence mode="wait">
           {wizardStep === WizardSteps.SelectProvider && (
             <motion.div
               key="select-type-step"