diff --git a/Wallet.Avalonia/WalletNavigationView.axaml b/Wallet.Avalonia/WalletNavigationView.axaml
index e6fe981..daa40a0 100644
--- a/Wallet.Avalonia/WalletNavigationView.axaml
+++ b/Wallet.Avalonia/WalletNavigationView.axaml
@@ -16,6 +16,7 @@
             <ConditionAction>
                 <ConditionAction.Condition>
                     <ConditionalExpression ForwardChaining="And">
+                        <ComparisonCondition LeftOperand="{Binding IsActivated}" RightOperand="False" />
                         <ComparisonCondition LeftOperand="{Binding IsOpened}" RightOperand="False" />
                     </ConditionalExpression>
                 </ConditionAction.Condition>
diff --git a/Wallet/OpenWalletViewModel.cs b/Wallet/OpenWalletViewModel.cs
index ec78db2..33ca83e 100644
--- a/Wallet/OpenWalletViewModel.cs
+++ b/Wallet/OpenWalletViewModel.cs
@@ -50,4 +50,16 @@ public partial class OpenWalletViewModel :
             }
         }
     }
+
+    public override async Task OnActivated()
+    {
+        Publisher.Publish(Activated.As<Wallet>());
+        await base.OnActivated();
+    }
+
+    public override async Task OnDeactivated()
+    {
+        Publisher.Publish(Deactivated.As<Wallet>());
+        await base.OnDeactivated();
+    }
 }
\ No newline at end of file