diff --git a/Wallet.Avalonia/ItemNavigationView.axaml b/Wallet.Avalonia/ItemNavigationView.axaml
index 32796a8..b082016 100644
--- a/Wallet.Avalonia/ItemNavigationView.axaml
+++ b/Wallet.Avalonia/ItemNavigationView.axaml
@@ -21,6 +21,7 @@
                 <Parameter Key="Favourite" Value="{Binding IsFavourite}" />
                 <Parameter Key="Archived" Value="{Binding IsArchived}" />
                 <Parameter Key="State" Value="{x:Static vm:ItemState.Read}" />
+                <Parameter Key="Transition" Value="Suppress" />
                 <Parameter Key="IsBackStackEnabled" Value="{x:False}" />
                 <Parameter Key="ClearBackStack" Value="{x:True}" />
             </NavigateAction>
diff --git a/Wallet.Avalonia/MultilineTextEntryView.axaml b/Wallet.Avalonia/MultilineTextEntryView.axaml
index 01b0aad..2095914 100644
--- a/Wallet.Avalonia/MultilineTextEntryView.axaml
+++ b/Wallet.Avalonia/MultilineTextEntryView.axaml
@@ -5,7 +5,8 @@
     xmlns:vm="using:Wallet"
     x:DataType="vm:MultilineTextEntryViewModel"
     Header="{Binding Key}"
-    IsExpanded="True">
+    IsExpanded="True"
+    IsToggleable="True">
     <TextBox Text="{Binding Value}" TextWrapping="Wrap">
         <TextBox.Styles>
             <Style Selector="TextBox.Write">
diff --git a/Wallet.Avalonia/WalletView.axaml b/Wallet.Avalonia/WalletView.axaml
index 3acd453..11d77af 100644
--- a/Wallet.Avalonia/WalletView.axaml
+++ b/Wallet.Avalonia/WalletView.axaml
@@ -65,13 +65,13 @@
                         </Interaction.Behaviors>
                     </ContentControl>
                 </Border>
-                <Frame Grid.Row="1">
+                <ContentControl Grid.Row="1">
                     <Interaction.Behaviors>
                         <AttachedBehaviour>
                             <NavigateRegionAction Name="{Binding Named, StringFormat='{}{0}:Content'}" />
                         </AttachedBehaviour>
                     </Interaction.Behaviors>
-                </Frame>
+                </ContentControl>
             </Grid>
         </Border>
     </Grid>