diff --git a/src/composables/modals.ts b/src/composables/modals.ts
index d1f2dc0a6..89e1eeb17 100644
--- a/src/composables/modals.ts
+++ b/src/composables/modals.ts
@@ -215,8 +215,13 @@ export function useModals() {
     openModal(MODAL_ENABLE_BIOMETRIC_LOGIN);
   }
 
+  function closeAllModals() {
+    modalsOpenRaw.value?.forEach(({ key }) => closeModalByKey(key));
+  }
+
   return {
     modalsOpen,
+    closeAllModals,
     registerModal,
     openModal,
     openDefaultModal,
diff --git a/src/popup/App.vue b/src/popup/App.vue
index 953dcca3c..ed5cc1818 100644
--- a/src/popup/App.vue
+++ b/src/popup/App.vue
@@ -365,7 +365,7 @@ export default defineComponent({
 
     .app-unauthenticated-placeholder {
       position: absolute;
-      z-index: 2;
+      z-index: $z-index-placeholder;
       inset: 0;
       visibility: hidden;
       opacity: 0;
diff --git a/src/popup/components/Modals/PasswordLogin.vue b/src/popup/components/Modals/PasswordLogin.vue
index 70ed652e8..70d75038f 100644
--- a/src/popup/components/Modals/PasswordLogin.vue
+++ b/src/popup/components/Modals/PasswordLogin.vue
@@ -143,9 +143,12 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
+@use '@/styles/variables' as *;
 @use '@/styles/typography';
 
 .password-login {
+  z-index: $z-index-login-modal;
+
   .content-wrapper,
   .password-login-form {
     display: flex;
diff --git a/src/popup/components/Modals/ResetWalletModal.vue b/src/popup/components/Modals/ResetWalletModal.vue
index bc0c9990a..2f33e4995 100644
--- a/src/popup/components/Modals/ResetWalletModal.vue
+++ b/src/popup/components/Modals/ResetWalletModal.vue
@@ -63,6 +63,7 @@ import { IS_MOBILE_APP } from '@/constants';
 import {
   useAccounts,
   useAeSdk,
+  useModals,
   useNetworks,
   usePermissions,
   useUi,
@@ -95,6 +96,7 @@ export default defineComponent({
     const { resetUiSettings } = useUi();
     const { disconnectDapps } = useAeSdk();
     const { resetPermissions } = usePermissions();
+    const { closeAllModals } = useModals();
 
     async function onReset() {
       resetAccounts();
@@ -102,6 +104,7 @@ export default defineComponent({
       resetUiSettings();
       disconnectDapps();
       resetPermissions();
+      closeAllModals();
 
       WalletStorage.clear();
       if (IS_MOBILE_APP) {
@@ -129,6 +132,8 @@ export default defineComponent({
 @use '@/styles/variables' as *;
 
 .reset-wallet {
+  z-index: $z-index-login-modal;
+
   .icon-wrapper {
     margin: 8px auto 18px;
     color: $color-danger;
diff --git a/src/styles/variables.scss b/src/styles/variables.scss
index 5f3516fa6..46d7a5a2e 100644
--- a/src/styles/variables.scss
+++ b/src/styles/variables.scss
@@ -13,6 +13,8 @@ $font-mono: 'IBM Plex Mono';
 
 $z-index-header: 2;
 $z-index-modal: $z-index-header + 2;
+$z-index-placeholder: $z-index-modal + 1;
+$z-index-login-modal: $z-index-placeholder + 1;
 $z-index-loader: $z-index-modal - 1; // Modals should always be above the loader
 $z-index-back-to-top: $z-index-modal + 1;