diff --git a/Bitvault.Avalonia/ContainerView.axaml b/Bitvault.Avalonia/ContainerView.axaml
index 6f1fb47..d04e51a 100644
--- a/Bitvault.Avalonia/ContainerView.axaml
+++ b/Bitvault.Avalonia/ContainerView.axaml
@@ -26,9 +26,10 @@
             Grid.Row="1"
             Grid.Column="0"
             Margin="2,-1,0,0"
+            AutoScrollToSelectedItem="True"
             ItemTemplate="{ReflectionBinding Template}"
             ItemsSource="{Binding}"
-            SelectedIndex="{Binding SelectedIndex}"
+            SelectedItem="{Binding SelectedItem}"
             SelectionMode="Single">
             <ListBox.Styles>
                 <Style Selector="ListBoxItem">
diff --git a/Bitvault.Avalonia/ItemNavigationView.axaml b/Bitvault.Avalonia/ItemNavigationView.axaml
index 1931c10..448c349 100644
--- a/Bitvault.Avalonia/ItemNavigationView.axaml
+++ b/Bitvault.Avalonia/ItemNavigationView.axaml
@@ -9,6 +9,26 @@
         <SolidColorBrush x:Key="StarredIconForegroundBrush" Color="#FFEDB120" />
     </ListBoxItem.Resources>
     <Interaction.Behaviors>
+        <AttachedBehaviour>
+            <ConditionAction>
+                <ConditionAction.Condition>
+                    <ConditionalExpression ForwardChaining="And">
+                        <ComparisonCondition LeftOperand="{Binding Selected}" RightOperand="True" />
+                    </ConditionalExpression>
+                </ConditionAction.Condition>
+                <NavigateAction
+                    Region="{Binding Named, StringFormat='{}{0}:Content'}"
+                    Route="Item"
+                    Scope="self">
+                    <NavigateAction.ParameterBindings>
+                        <ParameterBinding Key="Name" Value="{Binding Name}" />
+                        <ParameterBinding Key="Immutable" Value="{x:True}" />
+                        <ParameterBinding Key="Archived" Value="{Binding Archived}" />
+                        <ParameterBinding Key="Favourite" Value="{Binding Favourite}" />
+                    </NavigateAction.ParameterBindings>
+                </NavigateAction>
+            </ConditionAction>
+        </AttachedBehaviour>
         <DataTriggerBehavior Binding="{Binding Selected}" Value="True">
             <NavigateAction
                 Region="{Binding Named, StringFormat='{}{0}:Content'}"