diff --git a/Wallet.Avalonia/ItemNavigationView.axaml b/Wallet.Avalonia/ItemNavigationView.axaml
index 927abfa..40d98fd 100644
--- a/Wallet.Avalonia/ItemNavigationView.axaml
+++ b/Wallet.Avalonia/ItemNavigationView.axaml
@@ -19,7 +19,7 @@
                 <Parameter Key="Favourite" Value="{Binding Favourite}" />
                 <Parameter Key="Archived" Value="{Binding Archived}" />
                 <Parameter Key="State" Value="{x:Static vm:ItemState.Read}" />
-                <Parameter Key="IsBackStackEnabled" Value="{x:True}" />
+                <Parameter Key="IsBackStackEnabled" Value="{x:False}" />
                 <Parameter Key="ClearBackStack" Value="{x:True}" />
             </NavigateAction>
         </AttachedEventTriggerBehaviour>
diff --git a/Wallet.Avalonia/WalletView.axaml b/Wallet.Avalonia/WalletView.axaml
index d0acc3e..9bf6435 100644
--- a/Wallet.Avalonia/WalletView.axaml
+++ b/Wallet.Avalonia/WalletView.axaml
@@ -60,13 +60,13 @@
                         </Interaction.Behaviors>
                     </ContentControl>
                 </Border>
-                <ContentControl Grid.Row="1">
+                <Frame Grid.Row="1">
                     <Interaction.Behaviors>
                         <AttachedBehaviour>
                             <NavigateRegionAction Name="{Binding Named, StringFormat='{}{0}:Content'}" />
                         </AttachedBehaviour>
                     </Interaction.Behaviors>
-                </ContentControl>
+                </Frame>
             </Grid>
         </Border>
     </Grid>