diff --git a/components/ui/ChooseWalletOverlay.vue b/components/ui/ChooseWalletOverlay.vue
index 5d1afb4..ec4612d 100644
--- a/components/ui/ChooseWalletOverlay.vue
+++ b/components/ui/ChooseWalletOverlay.vue
@@ -1,5 +1,5 @@
 <template>
-  <OverlayDialog :show="show" :close="close" title="Access Your Wallet!">
+  <OverlayDialog :show="show" :close="closeProxy" title="Access Your Wallet!">
     <div class="mt-2">
       <div v-if="hasCreateTestingAccountFn" class="mt-4">
         <p class="text-sm text-gray-400">How would you like to connect?</p>
@@ -129,6 +129,15 @@ const hasCreateTestingAccountFn = computed(
   () => typeof props.createTestingAccount === "function",
 );
 
+// even if the same account stays selected and the overlay is manually closed
+// we need to call onExtensionAccountChange. otherwise the balance poll will wait forever
+const closeProxy = () => {
+  if (selectedExtensionAccount.value) {
+    props.onExtensionAccountChange(selectedExtensionAccount.value);
+  }
+  props.close();
+};
+
 watch(selectedExtensionAccount, async (selectedAddress) => {
   if (selectedAddress) {
     props.onExtensionAccountChange(selectedAddress);
diff --git a/store/systemHealth.ts b/store/systemHealth.ts
index 1473f52..7dd221f 100644
--- a/store/systemHealth.ts
+++ b/store/systemHealth.ts
@@ -86,11 +86,11 @@ export const useSystemHealth = defineStore("system-health", {
         shieldingTargetLastBlockNumber?.value -
         shieldingTargetImportedBlockNumber?.value;
       let importHealth;
-      if (lag < 5) {
+      if (lag <= 6) {
         importHealth = Health.Healthy;
-      } else if (lag < 10) {
+      } else if (lag < 12) {
         importHealth = Health.Warning;
-      } else if (lag >= 10) {
+      } else if (lag >= 12) {
         importHealth = Health.Critical;
       } else {
         importHealth = Health.Unknown;