diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml b/src/KeyKeeper/Views/CreateVaultDialog.axaml
index ec10c2e..fe07713 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml
@@ -1,93 +1,94 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="KeyKeeper.Views.CreateVaultFileWindow"
+        x:Class="KeyKeeper.Views.CreateVaultDialog"
         Title="Create New Vault"
         Background="#fff"
+        Focusable="True"
         Icon="/Assets/icon.ico"
         Width="600" Height="450"
         WindowStartupLocation="CenterOwner"
         CanResize="False"
         x:Name="ThisWindow">
 
-	<Grid ColumnDefinitions="1.5*, 2*">
-		<!-- Левая синяя панель -->
-		<Border Background="#2328C4" Grid.Column="0">
-			<StackPanel VerticalAlignment="Center" Margin="20">
-				<TextBlock Text="Choose where to save your password database and set a master password"
+    <Grid ColumnDefinitions="1.5*, 2*">
+        <!-- Левая синяя панель -->
+        <Border Background="#2328C4" Grid.Column="0">
+            <StackPanel VerticalAlignment="Center" Margin="20">
+                <TextBlock Text="Choose where to save your password database and set a master password"
                            TextWrapping="Wrap"
                            Foreground="#E0E0FF"
                            FontSize="20"
                            TextAlignment="Center"/>
-			</StackPanel>
-		</Border>
+            </StackPanel>
+        </Border>
 
-		<!-- Правая белая панель с формой -->
-		<ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
-			<StackPanel Margin="30" VerticalAlignment="Center" Spacing="20">
-				<TextBlock Text="Create new vault"
+        <!-- Правая белая панель с формой -->
+        <ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+            <StackPanel Margin="30" VerticalAlignment="Center" Spacing="20">
+                <TextBlock Text="Create new vault"
                            FontSize="22"
                            FontWeight="Bold"
                            Foreground="#2328C4"/>
 
-				<!-- Выбор файла -->
-				<StackPanel Spacing="10">
-					<TextBlock Text="File location" FontWeight="SemiBold" Foreground="Black" />
-					<Grid ColumnDefinitions="*, Auto" ColumnSpacing="10">
-						<TextBox x:Name="FilePathTextBox"
+                <!-- Выбор файла -->
+                <StackPanel Spacing="10">
+                    <TextBlock Text="File location" FontWeight="SemiBold" Foreground="Black" />
+                    <Grid ColumnDefinitions="*, Auto" ColumnSpacing="10">
+                        <TextBox x:Name="FilePathTextBox"
                                  Grid.Column="0"
                                  Watermark="Select file path..."
                                  Padding="10,8"/>
-						<Button x:Name="BrowseButton"
+                        <Button x:Name="BrowseButton"
                                 Grid.Column="1"
                                 Content="Browse..."
                                 Classes="secondaryButton"
                                 Padding="15,8"
                                 Click="BrowseButton_Click"/>
-					</Grid>
-					<TextBlock x:Name="PathWarning"
+                    </Grid>
+                    <TextBlock x:Name="PathWarning"
                                FontSize="12"
                                Foreground="Orange"
                                Text=" "/>
-				</StackPanel>
+                </StackPanel>
 
-				<!-- Ввод мастер-пароля -->
-				<StackPanel Spacing="10">
-					<TextBlock Text="Master password" FontWeight="SemiBold" Foreground="Black" />
-					<TextBox x:Name="PasswordBox"
+                <!-- Ввод мастер-пароля -->
+                <StackPanel Spacing="10">
+                    <TextBlock Text="Master password" FontWeight="SemiBold" Foreground="Black" />
+                    <TextBox x:Name="PasswordBox"
                              PasswordChar="*"
                              Watermark="Enter password"
                              Padding="10,8"/>
-				</StackPanel>
+                </StackPanel>
 
-				<StackPanel Spacing="10">
-					<TextBlock Text="Confirm password" FontWeight="SemiBold" Foreground="Black" />
-					<TextBox x:Name="ConfirmPasswordBox"
+                <StackPanel Spacing="10">
+                    <TextBlock Text="Confirm password" FontWeight="SemiBold" Foreground="Black" />
+                    <TextBox x:Name="ConfirmPasswordBox"
                              PasswordChar="*"
                              Watermark="Confirm password"
                              Padding="10,8"/>
-				</StackPanel>
+                </StackPanel>
 
-				<!-- Сообщение об ошибке пароля -->
-				<TextBlock x:Name="PasswordErrorText"
+                <!-- Сообщение об ошибке пароля -->
+                <TextBlock x:Name="PasswordErrorText"
                            FontSize="12"
                            Foreground="Red"
                            Text=""
                            IsVisible="False"/>
 
-				<!-- Кнопки действий -->
-				<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="10" Margin="0,20,0,0">
-					<Button Content="Cancel"
+                <!-- Кнопки действий -->
+                <StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="10" Margin="0,20,0,0">
+                    <Button Content="Cancel"
                             Classes="secondaryButton"
                             Width="80"
                             Click="CancelButton_Click"/>
-					<Button x:Name="CreateButton"
+                    <Button x:Name="CreateButton"
                             Content="Create"
                             Classes="accentButton"
                             Width="80"
                             IsEnabled="False"
                             Click="CreateButton_Click"/>
-				</StackPanel>
-			</StackPanel>
-		</ScrollViewer>
-	</Grid>
+                </StackPanel>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
 </Window>
diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
index 4f908ab..3e62fb3 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
@@ -1,19 +1,18 @@
 using Avalonia;
 using Avalonia.Controls;
+using Avalonia.Input;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
-using System;
-using System.Threading.Tasks;
 
 namespace KeyKeeper.Views
 {
-    public partial class CreateVaultFileWindow : Window
+    public partial class CreateVaultDialog : Window
     {
         public string FilePath { get; private set; } = string.Empty;
         public string Password { get; private set; } = string.Empty;
         public bool Success { get; private set; }
 
-        public CreateVaultFileWindow()
+        public CreateVaultDialog()
         {
             InitializeComponent();
 #if DEBUG
@@ -22,6 +21,8 @@ namespace KeyKeeper.Views
             FilePathTextBox.TextChanged += OnTextChanged;
             PasswordBox.TextChanged += OnPasswordTextChanged;
             ConfirmPasswordBox.TextChanged += OnPasswordTextChanged;
+
+            KeyDown += CreateVaultDialog_KeyDown;
         }
 
         private async void OnTextChanged(object? sender, TextChangedEventArgs e)
@@ -60,6 +61,18 @@ namespace KeyKeeper.Views
             CreateButton.IsEnabled = pathValid && passwordsEntered;
         }
 
+        private void CreateVaultDialog_KeyDown(object? sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                Close();
+            }
+            else if (e.Key == Key.Enter && CreateButton.IsEnabled)
+            {
+                Submit();
+            }
+        }
+
         private async void BrowseButton_Click(object? sender, RoutedEventArgs e)
         {
             var file = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
@@ -83,6 +96,11 @@ namespace KeyKeeper.Views
         }
 
         private void CreateButton_Click(object? sender, RoutedEventArgs e)
+        {
+            Submit();
+        }
+
+        private void Submit()
         {
             string path = FilePathTextBox.Text ?? "";
             if (string.IsNullOrWhiteSpace(path))
diff --git a/src/KeyKeeper/Views/EntryEditWindow.axaml b/src/KeyKeeper/Views/EntryEditWindow.axaml
index 7274990..3bdf1c3 100644
--- a/src/KeyKeeper/Views/EntryEditWindow.axaml
+++ b/src/KeyKeeper/Views/EntryEditWindow.axaml
@@ -4,30 +4,30 @@
         x:Class="KeyKeeper.Views.EntryEditWindow"
         Title="Add Entry"
         CanResize="False"
-        Width="540"
-        Height="300"
+        Width="400"
+        Height="250"
         Background="White">
 
-    <Grid RowDefinitions="Auto,Auto,Auto,Auto,Auto" ColumnDefinitions="*,*" Margin="5">
+    <Grid RowDefinitions="Auto,Auto,Auto,Auto,*" ColumnDefinitions="1*,3*" Margin="5">
         <TextBlock Text="Add New Password Entry" FontSize="20" HorizontalAlignment="Center"
-                   Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2"/>
+                Grid.Row="0" Grid.Column="0" Grid.ColumnSpan="2" Margin="0,0,0,20"/>
 
         <TextBlock Text="Entry name:" HorizontalAlignment="Right"
-                   Grid.Row="1" Grid.Column="0" Margin="5" />
+                Grid.Row="1" Grid.Column="0" Margin="5" />
         <TextBox Name="EntryNameEdit" Grid.Row="1" Grid.Column="1" Margin="5" />
 
         <TextBlock Text="Username:" HorizontalAlignment="Right"
-                   Grid.Row="2" Grid.Column="0" Margin="5" />
+                Grid.Row="2" Grid.Column="0" Margin="5" />
         <TextBox Name="UsernameEdit" Grid.Row="2" Grid.Column="1" Margin="5" />
 
         <TextBlock Text="Password:" HorizontalAlignment="Right"
-                   Grid.Row="3" Grid.Column="0" Margin="5" />
+                Grid.Row="3" Grid.Column="0" Margin="5" />
         
-        <!-- ��������� ��� ���� ������ � ���������� -->
+        <!-- ��������� ��� ���� ������ � ���������� -->
         <Grid Grid.Row="3" Grid.Column="1" Margin="5" RowDefinitions="Auto,Auto">
             <TextBox Name="PasswordEdit" Grid.Row="0" PasswordChar="*" />
             
-            <!-- ��������� ���������� ������ -->
+            <!-- ��������� ���������� ������ -->
             <Border Name="PasswordStrengthIndicator" Grid.Row="1" 
                     Height="4" CornerRadius="2" Margin="0,3,0,0"
                     Background="#ddd">
@@ -37,10 +37,10 @@
                         CornerRadius="2" />
             </Border>
         </Grid>
-
-        <Button Content="Add!" HorizontalAlignment="Center"
-                Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"
-                Background="#aaa" Click="AddButton_Click" />
+        
+        <Button Content="Done" HorizontalAlignment="Center" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2"
+                    VerticalAlignment="Bottom"
+                    Background="#aaa" Click="AddButton_Click" />
     </Grid>
 
     <Window.Styles>
@@ -50,12 +50,5 @@
         <Style Selector="TextBox">
             <Setter Property="Foreground" Value="Black" />
         </Style>
-        <Style Selector="Button /template/ ContentPresenter">
-            <Setter Property="Foreground" Value="Black" />
-        </Style>
-        <Style Selector="Button:pointerover /template/ ContentPresenter">
-            <Setter Property="Foreground" Value="Black" />
-            <Setter Property="Background" Value="#ccc" />
-        </Style>
     </Window.Styles>
 </Window>
\ No newline at end of file
diff --git a/src/KeyKeeper/Views/MainWindow.axaml b/src/KeyKeeper/Views/MainWindow.axaml
index 00b2174..5f2cd54 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml
+++ b/src/KeyKeeper/Views/MainWindow.axaml
@@ -56,7 +56,7 @@
         <Grid Grid.Column="1" VerticalAlignment="Center">
             <Grid RowDefinitions="Auto,Auto">
 
-                <TextBlock Text="Recent Database"
+                <TextBlock Text="Recently opened"
                            FontSize="38"
                            Foreground="#2328C4"
                            FontWeight="SemiBold"
diff --git a/src/KeyKeeper/Views/MainWindow.axaml.cs b/src/KeyKeeper/Views/MainWindow.axaml.cs
index ee8549a..a8ca5f2 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml.cs
+++ b/src/KeyKeeper/Views/MainWindow.axaml.cs
@@ -22,7 +22,7 @@ namespace KeyKeeper.Views
 
         private async void CreateNewVault_Click(object sender, RoutedEventArgs e)
         {
-            var createVaultDialog = new CreateVaultFileWindow();
+            var createVaultDialog = new CreateVaultDialog();
             await createVaultDialog.ShowDialog(this);
 
             if (createVaultDialog.Success &&
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml b/src/KeyKeeper/Views/RepositoryWindow.axaml
index 126c690..e412e8b 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml
@@ -4,7 +4,7 @@
         xmlns:i="using:Avalonia.Interactivity"
         xmlns:kkp="using:KeyKeeper.Views"
         x:Class="KeyKeeper.Views.RepositoryWindow"
-    Closing="RepositoryWindow_Closing"
+        Closing="RepositoryWindow_Closing"
         Title="KeyKeeper - Password store"
         CanResize="False"
         Width="800"
@@ -12,59 +12,60 @@
         Background="White"
         x:DataType="vm:RepositoryWindowViewModel">
 
-  <Window.DataTemplates>
-    <DataTemplate DataType="{x:Type vm:UnlockedRepositoryViewModel}">
-      <Grid>
-        <!-- Синий левый край -->
-        <Border Width="200"
-                        Background="#2328C4"
-                        HorizontalAlignment="Left"
-                        VerticalAlignment="Stretch"/>
-        <StackPanel Margin="20" HorizontalAlignment="Left">
-          <!-- Надпись KeyKeeper -->
-          <TextBlock Text="KeyKeeper"
-                               FontSize="32"
-                               FontWeight="Bold"
-                               HorizontalAlignment="Left"
-                               Margin="0,0,0,20"/>
+    <Window.DataTemplates>
+        <DataTemplate DataType="{x:Type vm:UnlockedRepositoryViewModel}">
+            <Grid>
+                <!-- Синий левый край -->
+                <Border Width="224"
+                                Background="#2A2ABB"
+                                HorizontalAlignment="Left"
+                                VerticalAlignment="Stretch">
+
+                    <StackPanel Margin="20" HorizontalAlignment="Left">
+
+                        <Svg Path="/Assets/logo_en.svg"
+                        Stretch="Uniform" />
 
                         <!-- Таймер блокировки под надписью KeyKeeper -->
                         <Border Background="#CC000000"
                                 CornerRadius="6"
                                 Padding="8,4"
                                 HorizontalAlignment="Left"
-                                Margin="0,0,0,12"
+                                Margin="0,12,0,12"
                                 IsVisible="{Binding $parent[Window].DataContext.LockTimerDisplay,
                                             Converter={x:Static StringConverters.IsNotNullOrEmpty}}">
+
                             <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
+
                                 <!-- Иконка замка (Material Design lock outline) -->
                                 <Path Fill="White"
-                                      VerticalAlignment="Center"
-                                      Width="13" Height="13"
-                                      Stretch="Uniform"
-                                      Data="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/>
+                                        VerticalAlignment="Center"
+                                        Width="13" Height="13"
+                                        Stretch="Uniform"
+                                        Data="M18 8h-1V6c0-2.76-2.24-5-5-5S7 3.24 7 6v2H6c-1.1 0-2 .9-2 2v10c0 1.1.9 2 2 2h12c1.1 0 2-.9 2-2V10c0-1.1-.9-2-2-2zm-6 9c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zm3.1-9H8.9V6c0-1.71 1.39-3.1 3.1-3.1 1.71 0 3.1 1.39 3.1 3.1v2z"/>
+
                                 <TextBlock Text="{Binding $parent[Window].DataContext.LockTimerDisplay}"
-                                           Foreground="White"
-                                           FontSize="13"
-                                           FontWeight="SemiBold"
-                                           VerticalAlignment="Center"/>
+                                            Foreground="White"
+                                            FontSize="13"
+                                            FontWeight="SemiBold"
+                                            VerticalAlignment="Center"/>
                             </StackPanel>
                         </Border>
 
-                        <!-- Рамочка  -->
-            <!-- <Border BorderBrush="Gray" 
-                                BorderThickness="1" 
-                                CornerRadius="5"
-                                Padding="20"
-                                Background="#F5F5F5"
-                                HorizontalAlignment="Left">
+                                    <!-- Рамочка  -->
+                        <!-- <Border BorderBrush="Gray"
+                                            BorderThickness="1"
+                                            CornerRadius="5"
+                                            Padding="20"
+                                            Background="#F5F5F5"
+                                            HorizontalAlignment="Left">
 
-            <StackPanel HorizontalAlignment="Left">
-              <Button Content="All Passwords"
-                                    Width="120"
-                                    Height="30"
-                                    HorizontalAlignment="Left"/>
-            </StackPanel>
+                        <StackPanel HorizontalAlignment="Left">
+                            <Button Content="All Passwords"
+                                                Width="120"
+                                                Height="30"
+                                                HorizontalAlignment="Left"/>
+                        </StackPanel>
 
                         </Border> -->
                         <!-- Save Passwords -->
@@ -75,93 +76,104 @@
                                 HorizontalAlignment="Left"
                                 Margin="0,20,0,0"/>
 
-          <!-- New Entry -->
-          <Button Content="New Entry"
-                            Classes="accentSidebarButton"
-                            Click="AddEntryButton_Click"
-                            Height="30"
-                            HorizontalAlignment="Left"
-                            Margin="0,20,0,0"/>
+                        <!-- New Entry -->
+                        <Button Content="New Entry"
+                                        Classes="accentSidebarButton"
+                                        Click="AddEntryButton_Click"
+                                        Height="30"
+                                        HorizontalAlignment="Left"
+                                        Margin="0,20,0,0"/>
 
-          <!-- Edit Selected Entry -->
-          <Button Content="Edit Selected Entry"
-                            Classes="accentSidebarButton"
-                            Click="EditEntryButton_Click"
-                            Height="30"
-                            HorizontalAlignment="Left"
-                            Margin="0,20,0,0"/>
-        </StackPanel>
+                        <!-- Edit Selected Entry -->
+                        <Button Content="Edit Selected Entry"
+                                        Classes="accentSidebarButton"
+                                        Click="EditEntryButton_Click"
+                                        Height="30"
+                                        HorizontalAlignment="Left"
+                                        Margin="0,20,0,0"/>
+                    </StackPanel>
+                </Border>
 
-        <!-- ListBox с паролями -->
-        <ListBox x:Name="PasswordsListBox"
-                         Width="580"
-                         Margin="210 10 10 10"
+                <!-- ListBox с паролями -->
+                <ListBox x:Name="PasswordsListBox"
+                         Margin="234 10 10 10"
                          ItemsSource="{Binding Passwords}"
                          Background="Transparent"
-                         SelectionMode="Single">
-          <ListBox.ItemsPanel>
-            <ItemsPanelTemplate>
-              <WrapPanel Orientation="Horizontal" />
-            </ItemsPanelTemplate>
-          </ListBox.ItemsPanel>
+                         SelectionMode="Single"
+                         KeyDown="PasswordsListBox_KeyDown">
 
-          <ListBox.ItemTemplate>
-            <DataTemplate>
-              <Border Background="Transparent" DoubleTapped="Entry_DoubleTapped">
-                <StackPanel Width="100"
+                    <ListBox.ItemsPanel>
+                        <ItemsPanelTemplate>
+                            <WrapPanel Orientation="Horizontal"/>
+                        </ItemsPanelTemplate>
+                    </ListBox.ItemsPanel>
+
+                    <ListBox.ItemTemplate>
+                        <DataTemplate>
+                            <Border Background="Transparent"
+                                    DoubleTapped="Entry_DoubleTapped">
+
+                                <StackPanel Width="100"
                                             Margin="10"
                                             HorizontalAlignment="Center">
-                  <Svg Path="{Binding IconPath}" Width="48" Height="48"/>
-                  <TextBlock Text="{Binding Name}"
+
+                                    <Svg Path="{Binding IconPath}" Width="48" Height="48"/>
+                                    <TextBlock Text="{Binding Name}"
                                                HorizontalAlignment="Center"
                                                Foreground="Black" />
-                  <TextBlock Text="{Binding Username.Value}"
+                                    <TextBlock Text="{Binding Username.Value}"
                                                Foreground="#666"
                                                HorizontalAlignment="Center" />
-                </StackPanel>
-                <Border.ContextMenu>
-                  <ContextMenu>
-                    <MenuItem Name="entryCtxMenuCopyUsername" Header="Copy username" Click="EntryContextMenuItem_Click"/>
-                    <MenuItem Name="entryCtxMenuCopyPassword" Header="Copy password" Click="EntryContextMenuItem_Click"/>
-                    <!-- Новый пункт меню "Edit" -->
-                    <MenuItem Name="entryCtxMenuEdit" Header="Edit" Click="EntryContextMenuItem_Click"/>
-                    <MenuItem Name="entryCtxMenuDelete" Header="Delete" Click="EntryContextMenuItem_Click"/>
-                  </ContextMenu>
-                </Border.ContextMenu>
-              </Border>
-            </DataTemplate>
-          </ListBox.ItemTemplate>
-        </ListBox>
+                                </StackPanel>
+                                <Border.ContextMenu>
+                                    <ContextMenu>
+                                        <MenuItem Name="entryCtxMenuCopyUsername" Header="Copy username" Click="EntryContextMenuItem_Click"/>
+                                        <MenuItem Name="entryCtxMenuCopyPassword" Header="Copy password" Click="EntryContextMenuItem_Click"/>
+                                        <MenuItem Name="entryCtxMenuEdit" Header="Edit" Click="EntryContextMenuItem_Click"/>
+                                        <MenuItem Name="entryCtxMenuDelete" Header="Delete" Click="EntryContextMenuItem_Click"/>
+                                    </ContextMenu>
+                                </Border.ContextMenu>
+                            </Border>
+                        </DataTemplate>
+                    </ListBox.ItemTemplate>
+                </ListBox>
 
-        <kkp:ToastNotificationHost x:Name="NotificationHost"
-                                            HorizontalAlignment="Center"
-                                            VerticalAlignment="Center"
-                                            Margin="20"
-                                            Duration="0:0:2" />
-      </Grid>
-    </DataTemplate>
+                <kkp:ToastNotificationHost x:Name="NotificationHost"
+                                           HorizontalAlignment="Center"
+                                           VerticalAlignment="Center"
+                                           Margin="20"
+                                           Duration="0:0:2" />
+            </Grid>
+        </DataTemplate>
 
-    <DataTemplate DataType="{x:Type vm:LockedRepositoryViewModel}">
-      <StackPanel Margin="20"
+        <DataTemplate DataType="{x:Type vm:LockedRepositoryViewModel}">
+            <StackPanel Margin="20"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         Spacing="10">
-        <TextBlock Text="Enter credentials to unlock"
+
+                <TextBlock Text="Enter credentials to unlock"
                            Foreground="#2328C4"
                            FontSize="32" />
 
-        <TextBox x:Name="UnlockPasswordEdit"
+                <TextBox x:Name="UnlockPasswordEdit"
                          Text="{Binding UnlockPassword, Mode=TwoWay}"
                          PasswordChar="*"
-                         Width="450" />
+                         Width="450"
+                         Loaded="UnlockPasswordEdit_Loaded">
 
-        <Button x:Name="UnlockButton"
+                    <TextBox.KeyBindings>
+                        <KeyBinding Gesture="Return" Command="{Binding TryUnlock}"/>
+                    </TextBox.KeyBindings>
+                </TextBox>
+
+                <Button x:Name="UnlockButton"
                         Command="{Binding TryUnlock}"
                         HorizontalAlignment="Center"
                         Content="Unlock!" />
-      </StackPanel>
-    </DataTemplate>
-  </Window.DataTemplates>
+            </StackPanel>
+        </DataTemplate>
+    </Window.DataTemplates>
 
-  <ContentControl Content="{Binding CurrentPage}"/>
+    <ContentControl Content="{Binding CurrentPage}"/>
 </Window>
diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
index 6e39894..470f1f7 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml.cs
@@ -39,6 +39,11 @@ public partial class RepositoryWindow : Window
             vm.ResetLockTimer();
     }
 
+    private void UnlockPasswordEdit_Loaded(object? sender, RoutedEventArgs e)
+    {
+        (sender as TextBox)?.Focus();
+    }
+
     private async void RepositoryWindow_Closing(object? sender, WindowClosingEventArgs e)
     {
         if (allowClose || closeConfirmationShown)
@@ -150,6 +155,18 @@ public partial class RepositoryWindow : Window
         }
     }
 
+    private void PasswordsListBox_KeyDown(object sender, KeyEventArgs args)
+    {
+        if (args.Key == Key.C && args.KeyModifiers == KeyModifiers.Control)
+        {
+            if (sender is ListBox list && list.SelectedItem is PassStoreEntryPassword pwd)
+            {
+                Clipboard!.SetTextAsync(pwd.Password.Value);
+                this.FindControlRecursive<ToastNotificationHost>("NotificationHost")?.Show("Password copied to clipboard");
+            }
+        }
+    }
+
     private async void EntryContextMenuItem_Click(object sender, RoutedEventArgs args)
     {
         if (args.Source is StyledElement s && s.DataContext is PassStoreEntryPassword pwd)