diff --git a/src/KeyKeeper/RepositoryWindow.axaml b/src/KeyKeeper/RepositoryWindow.axaml
index 601737b..8e26036 100644
--- a/src/KeyKeeper/RepositoryWindow.axaml
+++ b/src/KeyKeeper/RepositoryWindow.axaml
@@ -52,7 +52,18 @@
                 </Grid>
             </DataTemplate>
             <DataTemplate DataType="{x:Type vm:LockedRepositoryViewModel}">
-                
+                <StackPanel Margin="20"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center">
+                    <TextBox x:Name="UnlockPasswordEdit"
+                             PasswordChar="*"
+                             Width="450" />
+
+                    <Button x:Name="UnlockButton"
+                            HorizontalAlignment="Center"
+                            Foreground="Black"
+                            Content="Unlock!" />
+                </StackPanel>
             </DataTemplate>
         </Window.DataTemplates>
 
diff --git a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
index 8365bbf..df0c910 100644
--- a/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
+++ b/src/KeyKeeper/ViewModels/RepositoryWindowViewModel.cs
@@ -21,9 +21,9 @@ public class RepositoryWindowViewModel : ViewModelBase
 
     private void UpdateLockStatus()
     {
-        if (currentPage is LockedRepositoryViewModel && !passStore.Locked)
+        if ((currentPage == null || currentPage is LockedRepositoryViewModel) && !passStore.Locked)
             SwitchToUnlocked();
-        else if (currentPage is UnlockedRepositoryViewModel && passStore.Locked)
+        else if ((currentPage == null || currentPage is UnlockedRepositoryViewModel) && passStore.Locked)
             SwitchToLocked();
     }