diff --git a/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts b/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
index 78473f9fc3..5bf1a888f2 100644
--- a/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
+++ b/packages/shared/lib/core/stronghold/actions/checkOrUnlockStronghold.ts
@@ -1,5 +1,5 @@
 import { isStrongholdUnlocked } from '@core/profile-manager'
-import { openPopup, popupState } from '@auxiliary/popup'
+import { closePopup, openPopup, popupState } from '@auxiliary/popup'
 import { get } from 'svelte/store'
 import { handleError } from '@core/error/handlers/handleError'
 
@@ -17,10 +17,10 @@ export async function checkOrUnlockStronghold(
     }
     try {
         const strongholdUnlocked = await isStrongholdUnlocked()
-
         if (strongholdUnlocked) {
             return callback()
         } else {
+            closePopup(true)
             openPopup({
                 type: 'unlockStronghold',
                 props: {
diff --git a/yarn.lock b/yarn.lock
index 325681de4b..aaaa117a99 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -7502,7 +7502,7 @@ svelte-loader@^3.0.0:
     svelte-dev-helper "^1.1.9"
     svelte-hmr "^0.14.2"
 
-svelte-markdown@^0.2.3:
+svelte-markdown@0.2.3:
   version "0.2.3"
   resolved "https://registry.yarnpkg.com/svelte-markdown/-/svelte-markdown-0.2.3.tgz#16c6db61605512100cf25c3e18f8e4105837895c"
   integrity sha512-2h680NzTXnAD0CXhxe3GeHl6W+ayG4iKQRl+BIDRw+R0mUE0OiNxP1Vt8Rn+aWevB/LBiBIPCAwvL+0BkG057A==