From 90e583dfc9afe54b3f51b922a6909040f80df69d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=81=D1=82=D1=80=D0=BE=D0=B2=20=D0=9C=D0=B8?=
 =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= <bystrov_moon@mail.ru>
Date: Wed, 25 Feb 2026 11:26:40 +0300
Subject: [PATCH 1/6] Fix

Hide "All Passwords" button
---
 src/KeyKeeper/Views/RepositoryWindow.axaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/KeyKeeper/Views/RepositoryWindow.axaml b/src/KeyKeeper/Views/RepositoryWindow.axaml
index 5931901..2fde653 100644
--- a/src/KeyKeeper/Views/RepositoryWindow.axaml
+++ b/src/KeyKeeper/Views/RepositoryWindow.axaml
@@ -27,7 +27,7 @@
                                 Margin="0,0,0,20"/>
 
                         <!-- Рамочка  -->
-                        <Border BorderBrush="Gray" 
+						<!-- <Border BorderBrush="Gray" 
                                 BorderThickness="1" 
                                 CornerRadius="5"
                                 Padding="20"
@@ -41,7 +41,7 @@
                                         HorizontalAlignment="Left"/>
                             </StackPanel>
 
-                        </Border>
+                        </Border> -->
                         <!-- Save Passwords -->
                         <Button Content="Save Passwords"
                                 Classes="accentSidebarButton"

From 74e80c8485e7612f6e826022a1cd52349656bf85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=81=D1=82=D1=80=D0=BE=D0=B2=20=D0=9C=D0=B8?=
 =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= <bystrov_moon@mail.ru>
Date: Wed, 25 Feb 2026 18:45:18 +0300
Subject: [PATCH 2/6] Design/Add CreateValutWindow

---
 src/KeyKeeper/Views/CreateVaultDialog.axaml   | 69 +++++++++++++++++
 .../Views/CreateVaultDialog.axaml.cs          | 76 +++++++++++++++++++
 src/KeyKeeper/Views/MainWindow.axaml.cs       | 49 +++++-------
 3 files changed, 163 insertions(+), 31 deletions(-)
 create mode 100644 src/KeyKeeper/Views/CreateVaultDialog.axaml
 create mode 100644 src/KeyKeeper/Views/CreateVaultDialog.axaml.cs

diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml b/src/KeyKeeper/Views/CreateVaultDialog.axaml
new file mode 100644
index 0000000..32f0a28
--- /dev/null
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml
@@ -0,0 +1,69 @@
+<Window xmlns="https://github.com/avaloniaui"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="400"
+        x:Class="KeyKeeper.Views.CreateVaultFileWindow"
+        Title="Create New Vault"
+        Background="#fff"
+        Icon="/Assets/icon.ico"
+        Width="600" Height="400"
+        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"
+                           TextWrapping="Wrap"
+                           Foreground="#E0E0FF"
+                           FontSize="20"
+                           TextAlignment="Center"/>
+			</StackPanel>
+		</Border>
+
+		<!-- ������ ����� ������ � ������ -->
+		<StackPanel Grid.Column="1" Margin="30" VerticalAlignment="Center" Spacing="20">
+			<TextBlock Text="File location"
+                       FontSize="22"
+                       FontWeight="Bold"
+                       Foreground="#2328C4"/>
+
+			<Grid ColumnDefinitions="*, Auto" RowDefinitions="Auto" ColumnSpacing="10">
+				<TextBox x:Name="FilePathTextBox"
+                         Grid.Column="0"
+                         Watermark="Select file path..."
+                         Text="{Binding #ThisWindow.FilePath, Mode=TwoWay}"
+                         Padding="10,8"/>
+				<Button x:Name="BrowseButton"
+                        Grid.Column="1"
+                        Content="Browse..."
+                        Classes="secondaryButton"
+                        Padding="15,8"
+                        Click="BrowseButton_Click"/>
+			</Grid>
+
+			<!-- �������������� � ������������ ����� -->
+			<TextBlock x:Name="PathWarning"
+                       FontSize="12"
+                       Foreground="Orange"
+                       Text=" " />
+
+			<!-- ������ �������� -->
+			<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"
+                        Content="Next"
+                        Classes="accentButton"
+                        Width="80"
+                        IsEnabled="False"
+                        Click="CreateButton_Click"/>
+			</StackPanel>
+		</StackPanel>
+	</Grid>
+</Window>
\ No newline at end of file
diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
new file mode 100644
index 0000000..a01fd10
--- /dev/null
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
@@ -0,0 +1,76 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.Interactivity;
+using Avalonia.Platform.Storage;
+using System;
+using System.IO;
+
+namespace KeyKeeper.Views
+{
+    public partial class CreateVaultFileWindow : Window
+    {
+        public string FilePath { get; private set; } = string.Empty;
+        public bool Success { get; private set; }
+
+        public CreateVaultFileWindow()
+        {
+            InitializeComponent();
+#if DEBUG
+            this.AttachDevTools();
+#endif
+            FilePathTextBox.TextChanged += OnTextChanged;
+        }
+
+        private void OnTextChanged(object? sender, TextChangedEventArgs e)
+        {
+            string path = FilePathTextBox.Text ?? "";
+            CreateButton.IsEnabled = !string.IsNullOrWhiteSpace(path);
+
+            if (!string.IsNullOrWhiteSpace(path) && File.Exists(path))
+            {
+                PathWarning.Text = "File already exists. It will be overwritten.";
+            }
+            else
+            {
+                PathWarning.Text = "";
+            }
+        }
+
+        private async void BrowseButton_Click(object? sender, RoutedEventArgs e)
+        {
+            var file = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
+            {
+                Title = "Create new password store",
+                SuggestedFileName = "passwords.kkp",
+                DefaultExtension = "kkp",
+                FileTypeChoices = new[]
+                {
+                    new FilePickerFileType("KeyKeeper files")
+                    {
+                        Patterns = new[] { "*.kkp" }
+                    }
+                }
+            });
+
+            if (file != null && file.TryGetLocalPath() is string path)
+            {
+                FilePathTextBox.Text = path;
+            }
+        }
+
+        private void CreateButton_Click(object? sender, RoutedEventArgs e)
+        {
+            FilePath = FilePathTextBox.Text ?? "";
+            if (string.IsNullOrWhiteSpace(FilePath)) return;
+
+            Success = true;
+            Close();
+        }
+
+        private void CancelButton_Click(object? sender, RoutedEventArgs e)
+        {
+            Success = false;
+            Close();
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/KeyKeeper/Views/MainWindow.axaml.cs b/src/KeyKeeper/Views/MainWindow.axaml.cs
index ca63511..e6d8872 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml.cs
+++ b/src/KeyKeeper/Views/MainWindow.axaml.cs
@@ -22,40 +22,27 @@ namespace KeyKeeper.Views
 
         private async void CreateNewVault_Click(object sender, RoutedEventArgs e)
         {
-            var file = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
-            {
-                Title = "Create new password store",
-                SuggestedFileName = "passwords.kkp",
-                DefaultExtension = "kkp",
-                FileTypeChoices = new[]
-                {
-                    new FilePickerFileType("KeyKeeper files")
-                    {
-                        Patterns = new[] { "*.kkp" }
-                    }
-                }
-            });
+            var fileDialog = new CreateVaultFileWindow();
+            await fileDialog.ShowDialog(this);
 
-            if (file != null)
+            if (fileDialog.Success && !string.IsNullOrEmpty(fileDialog.FilePath))
             {
-                if (file.TryGetLocalPath() is string path)
+                var path = fileDialog.FilePath;
+                var passwordDialog = new PasswordDialog();
+                await passwordDialog.ShowDialog(this);
+                if (passwordDialog.Created && !string.IsNullOrEmpty(passwordDialog.Password))
                 {
-                    var passwordDialog = new PasswordDialog();
-                    await passwordDialog.ShowDialog(this);
-                    if (passwordDialog.Created && !string.IsNullOrEmpty(passwordDialog.Password))
-                    {
-                        var compositeKey = new CompositeKey(passwordDialog.Password, null);
-                        var passStoreAccessor = new PassStoreFileAccessor(
-                            filename: path,
-                            create: true,
-                            createOptions: new StoreCreationOptions()
-                            {
-                                Key = compositeKey,
-                                LockTimeoutSeconds = 800
-                            });
-                        IPassStore passStore = passStoreAccessor;
-                        OpenRepositoryWindow(passStore);
-                    }
+                    var compositeKey = new CompositeKey(passwordDialog.Password, null);
+                    var passStoreAccessor = new PassStoreFileAccessor(
+                        filename: path,
+                        create: true,
+                        createOptions: new StoreCreationOptions()
+                        {
+                            Key = compositeKey,
+                            LockTimeoutSeconds = 800
+                        });
+                    IPassStore passStore = passStoreAccessor;
+                    OpenRepositoryWindow(passStore);
                 }
             }
         }

From f78b526495f8a7df8d28a45aaaf55db6e85fe8ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=81=D1=82=D1=80=D0=BE=D0=B2=20=D0=9C=D0=B8?=
 =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= <bystrov_moon@mail.ru>
Date: Sat, 28 Feb 2026 15:46:36 +0300
Subject: [PATCH 3/6] Fix/AccessException

---
 src/KeyKeeper/Views/CreateVaultDialog.axaml    | 15 +++++++--------
 src/KeyKeeper/Views/CreateVaultDialog.axaml.cs | 17 ++++++++++++-----
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml b/src/KeyKeeper/Views/CreateVaultDialog.axaml
index 32f0a28..dd8dea5 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml
@@ -13,7 +13,7 @@
         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"
@@ -24,7 +24,7 @@
 			</StackPanel>
 		</Border>
 
-		<!-- ������ ����� ������ � ������ -->
+		<!-- Правая белая панель с формой -->
 		<StackPanel Grid.Column="1" Margin="30" VerticalAlignment="Center" Spacing="20">
 			<TextBlock Text="File location"
                        FontSize="22"
@@ -33,10 +33,9 @@
 
 			<Grid ColumnDefinitions="*, Auto" RowDefinitions="Auto" ColumnSpacing="10">
 				<TextBox x:Name="FilePathTextBox"
-                         Grid.Column="0"
-                         Watermark="Select file path..."
-                         Text="{Binding #ThisWindow.FilePath, Mode=TwoWay}"
-                         Padding="10,8"/>
+                        Grid.Column="0"
+                        Watermark="Select file path..."
+                        Padding="10,8"/>
 				<Button x:Name="BrowseButton"
                         Grid.Column="1"
                         Content="Browse..."
@@ -45,13 +44,13 @@
                         Click="BrowseButton_Click"/>
 			</Grid>
 
-			<!-- �������������� � ������������ ����� -->
+			<!-- Предупреждение о существующем файле -->
 			<TextBlock x:Name="PathWarning"
                        FontSize="12"
                        Foreground="Orange"
                        Text=" " />
 
-			<!-- ������ �������� -->
+			<!-- Кнопки действий -->
 			<StackPanel Orientation="Horizontal" HorizontalAlignment="Right" Spacing="10" Margin="0,20,0,0">
 				<Button Content="Cancel"
                         Classes="secondaryButton"
diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
index a01fd10..fdc9d53 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
@@ -21,18 +21,25 @@ namespace KeyKeeper.Views
             FilePathTextBox.TextChanged += OnTextChanged;
         }
 
-        private void OnTextChanged(object? sender, TextChangedEventArgs e)
+        private async void OnTextChanged(object? sender, TextChangedEventArgs e)
         {
             string path = FilePathTextBox.Text ?? "";
             CreateButton.IsEnabled = !string.IsNullOrWhiteSpace(path);
+            PathWarning.Text = "";
 
-            if (!string.IsNullOrWhiteSpace(path) && File.Exists(path))
+            if (string.IsNullOrWhiteSpace(path))
+                return;
+
+            try
             {
-                PathWarning.Text = "File already exists. It will be overwritten.";
+                var storageFile = await StorageProvider.TryGetFileFromPathAsync(path);
+                if (storageFile != null)
+                {
+                    PathWarning.Text = "File already exists. It will be overwritten.";
+                }
             }
-            else
+            catch
             {
-                PathWarning.Text = "";
             }
         }
 

From 112539880adbdd1f436390eea2989944f0012c26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=81=D1=82=D1=80=D0=BE=D0=B2=20=D0=9C=D0=B8?=
 =?UTF-8?q?=D1=85=D0=B0=D0=B8=D0=BB=20=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D1=8C?=
 =?UTF-8?q?=D0=B5=D0=B2=D0=B8=D1=87?= <bystrov_moon@mail.ru>
Date: Sun, 1 Mar 2026 14:06:55 +0300
Subject: [PATCH 4/6] Merge/CreateVaultDialog with PasswordDialog

---
 src/KeyKeeper/Views/CreateVaultDialog.axaml   | 107 +++++++++++-------
 .../Views/CreateVaultDialog.axaml.cs          |  56 +++++++--
 src/KeyKeeper/Views/MainWindow.axaml.cs       |  38 +++----
 src/KeyKeeper/Views/PasswordDialog.axaml      |  54 ---------
 src/KeyKeeper/Views/PasswordDialog.axaml.cs   |  65 -----------
 5 files changed, 132 insertions(+), 188 deletions(-)
 delete mode 100644 src/KeyKeeper/Views/PasswordDialog.axaml
 delete mode 100644 src/KeyKeeper/Views/PasswordDialog.axaml.cs

diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml b/src/KeyKeeper/Views/CreateVaultDialog.axaml
index dd8dea5..4d00fa8 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml
@@ -1,22 +1,19 @@
 <Window xmlns="https://github.com/avaloniaui"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        mc:Ignorable="d" d:DesignWidth="600" d:DesignHeight="400"
         x:Class="KeyKeeper.Views.CreateVaultFileWindow"
         Title="Create New Vault"
         Background="#fff"
         Icon="/Assets/icon.ico"
-        Width="600" Height="400"
+        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"
+				<TextBlock Text="Choose where to save your password database and set a master password"
                            TextWrapping="Wrap"
                            Foreground="#E0E0FF"
                            FontSize="20"
@@ -25,44 +22,72 @@
 		</Border>
 
 		<!-- Правая белая панель с формой -->
-		<StackPanel Grid.Column="1" Margin="30" VerticalAlignment="Center" Spacing="20">
-			<TextBlock Text="File location"
-                       FontSize="22"
-                       FontWeight="Bold"
-                       Foreground="#2328C4"/>
+		<ScrollViewer Grid.Column="1" VerticalScrollBarVisibility="Auto">
+			<StackPanel Margin="30" VerticalAlignment="Center" Spacing="20">
+				<TextBlock Text="Create new vault"
+                           FontSize="22"
+                           FontWeight="Bold"
+                           Foreground="#2328C4"/>
 
-			<Grid ColumnDefinitions="*, Auto" RowDefinitions="Auto" ColumnSpacing="10">
-				<TextBox x:Name="FilePathTextBox"
-                        Grid.Column="0"
-                        Watermark="Select file path..."
-                        Padding="10,8"/>
-				<Button x:Name="BrowseButton"
-                        Grid.Column="1"
-                        Content="Browse..."
-                        Classes="secondaryButton"
-                        Padding="15,8"
-                        Click="BrowseButton_Click"/>
-			</Grid>
+				<!-- Выбор файла -->
+				<StackPanel Spacing="10">
+					<TextBlock Text="File location" FontWeight="SemiBold"/>
+					<Grid ColumnDefinitions="*, Auto" ColumnSpacing="10">
+						<TextBox x:Name="FilePathTextBox"
+                                 Grid.Column="0"
+                                 Watermark="Select file path..."
+                                 Padding="10,8"/>
+						<Button x:Name="BrowseButton"
+                                Grid.Column="1"
+                                Content="Browse..."
+                                Classes="secondaryButton"
+                                Padding="15,8"
+                                Click="BrowseButton_Click"/>
+					</Grid>
+					<TextBlock x:Name="PathWarning"
+                               FontSize="12"
+                               Foreground="Orange"
+                               Text=" "/>
+				</StackPanel>
 
-			<!-- Предупреждение о существующем файле -->
-			<TextBlock x:Name="PathWarning"
-                       FontSize="12"
-                       Foreground="Orange"
-                       Text=" " />
+				<!-- Ввод мастер-пароля -->
+				<StackPanel Spacing="10">
+					<TextBlock Text="Master password" FontWeight="SemiBold"/>
+					<TextBox x:Name="PasswordBox"
+                             PasswordChar="*"
+                             Watermark="Enter password"
+                             Padding="10,8"/>
+				</StackPanel>
 
-			<!-- Кнопки действий -->
-			<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"
-                        Content="Next"
-                        Classes="accentButton"
-                        Width="80"
-                        IsEnabled="False"
-                        Click="CreateButton_Click"/>
+				<StackPanel Spacing="10">
+					<TextBlock Text="Confirm password" FontWeight="SemiBold"/>
+					<TextBox x:Name="ConfirmPasswordBox"
+                             PasswordChar="*"
+                             Watermark="Confirm password"
+                             Padding="10,8"/>
+				</StackPanel>
+
+				<!-- Сообщение об ошибке пароля -->
+				<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"
+                            Classes="secondaryButton"
+                            Width="80"
+                            Click="CancelButton_Click"/>
+					<Button x:Name="CreateButton"
+                            Content="Create"
+                            Classes="accentButton"
+                            Width="80"
+                            IsEnabled="False"
+                            Click="CreateButton_Click"/>
+				</StackPanel>
 			</StackPanel>
-		</StackPanel>
+		</ScrollViewer>
 	</Grid>
 </Window>
\ No newline at end of file
diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
index fdc9d53..d56b0b4 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
@@ -3,13 +3,13 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using System;
-using System.IO;
 
 namespace KeyKeeper.Views
 {
     public partial class CreateVaultFileWindow : 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()
@@ -19,20 +19,22 @@ namespace KeyKeeper.Views
             this.AttachDevTools();
 #endif
             FilePathTextBox.TextChanged += OnTextChanged;
+            PasswordBox.TextChanged += OnPasswordTextChanged;
+            ConfirmPasswordBox.TextChanged += OnPasswordTextChanged;
         }
 
-        private async void OnTextChanged(object? sender, TextChangedEventArgs e)
+        private void OnTextChanged(object? sender, TextChangedEventArgs e)
         {
-            string path = FilePathTextBox.Text ?? "";
-            CreateButton.IsEnabled = !string.IsNullOrWhiteSpace(path);
+            UpdateCreateButtonState();
             PathWarning.Text = "";
 
+            string path = FilePathTextBox.Text ?? "";
             if (string.IsNullOrWhiteSpace(path))
                 return;
 
             try
             {
-                var storageFile = await StorageProvider.TryGetFileFromPathAsync(path);
+                var storageFile = StorageProvider.TryGetFileFromPathAsync(path).GetAwaiter().GetResult();
                 if (storageFile != null)
                 {
                     PathWarning.Text = "File already exists. It will be overwritten.";
@@ -43,6 +45,20 @@ namespace KeyKeeper.Views
             }
         }
 
+        private void OnPasswordTextChanged(object? sender, TextChangedEventArgs e)
+        {
+            UpdateCreateButtonState();
+            PasswordErrorText.IsVisible = false;
+        }
+
+        private void UpdateCreateButtonState()
+        {
+            bool pathValid = !string.IsNullOrWhiteSpace(FilePathTextBox.Text);
+            bool passwordsEntered = !string.IsNullOrWhiteSpace(PasswordBox.Text) &&
+                                    !string.IsNullOrWhiteSpace(ConfirmPasswordBox.Text);
+            CreateButton.IsEnabled = pathValid && passwordsEntered;
+        }
+
         private async void BrowseButton_Click(object? sender, RoutedEventArgs e)
         {
             var file = await StorageProvider.SaveFilePickerAsync(new FilePickerSaveOptions
@@ -59,7 +75,7 @@ namespace KeyKeeper.Views
                 }
             });
 
-            if (file != null && file.TryGetLocalPath() is string path)
+            if (file?.TryGetLocalPath() is string path)
             {
                 FilePathTextBox.Text = path;
             }
@@ -67,13 +83,37 @@ namespace KeyKeeper.Views
 
         private void CreateButton_Click(object? sender, RoutedEventArgs e)
         {
-            FilePath = FilePathTextBox.Text ?? "";
-            if (string.IsNullOrWhiteSpace(FilePath)) return;
+            string path = FilePathTextBox.Text ?? "";
+            if (string.IsNullOrWhiteSpace(path))
+                return;
 
+            string password = PasswordBox.Text ?? "";
+            string confirm = ConfirmPasswordBox.Text ?? "";
+
+            if (string.IsNullOrEmpty(password) || string.IsNullOrEmpty(confirm))
+            {
+                ShowPasswordError("Password cannot be empty");
+                return;
+            }
+
+            if (password != confirm)
+            {
+                ShowPasswordError("Passwords don't match");
+                return;
+            }
+
+            FilePath = path;
+            Password = password;
             Success = true;
             Close();
         }
 
+        private void ShowPasswordError(string message)
+        {
+            PasswordErrorText.Text = message;
+            PasswordErrorText.IsVisible = true;
+        }
+
         private void CancelButton_Click(object? sender, RoutedEventArgs e)
         {
             Success = false;
diff --git a/src/KeyKeeper/Views/MainWindow.axaml.cs b/src/KeyKeeper/Views/MainWindow.axaml.cs
index e6d8872..ee8549a 100644
--- a/src/KeyKeeper/Views/MainWindow.axaml.cs
+++ b/src/KeyKeeper/Views/MainWindow.axaml.cs
@@ -22,28 +22,26 @@ namespace KeyKeeper.Views
 
         private async void CreateNewVault_Click(object sender, RoutedEventArgs e)
         {
-            var fileDialog = new CreateVaultFileWindow();
-            await fileDialog.ShowDialog(this);
+            var createVaultDialog = new CreateVaultFileWindow();
+            await createVaultDialog.ShowDialog(this);
 
-            if (fileDialog.Success && !string.IsNullOrEmpty(fileDialog.FilePath))
+            if (createVaultDialog.Success &&
+                !string.IsNullOrEmpty(createVaultDialog.FilePath) &&
+                !string.IsNullOrEmpty(createVaultDialog.Password))
             {
-                var path = fileDialog.FilePath;
-                var passwordDialog = new PasswordDialog();
-                await passwordDialog.ShowDialog(this);
-                if (passwordDialog.Created && !string.IsNullOrEmpty(passwordDialog.Password))
-                {
-                    var compositeKey = new CompositeKey(passwordDialog.Password, null);
-                    var passStoreAccessor = new PassStoreFileAccessor(
-                        filename: path,
-                        create: true,
-                        createOptions: new StoreCreationOptions()
-                        {
-                            Key = compositeKey,
-                            LockTimeoutSeconds = 800
-                        });
-                    IPassStore passStore = passStoreAccessor;
-                    OpenRepositoryWindow(passStore);
-                }
+                var path = createVaultDialog.FilePath;
+                var password = createVaultDialog.Password;
+                var compositeKey = new CompositeKey(password, null);
+                var passStoreAccessor = new PassStoreFileAccessor(
+                    filename: path,
+                    create: true,
+                    createOptions: new StoreCreationOptions()
+                    {
+                        Key = compositeKey,
+                        LockTimeoutSeconds = 800
+                    });
+                IPassStore passStore = passStoreAccessor;
+                OpenRepositoryWindow(passStore);
             }
         }
 
diff --git a/src/KeyKeeper/Views/PasswordDialog.axaml b/src/KeyKeeper/Views/PasswordDialog.axaml
deleted file mode 100644
index 27b58c2..0000000
--- a/src/KeyKeeper/Views/PasswordDialog.axaml
+++ /dev/null
@@ -1,54 +0,0 @@
-<Window xmlns="https://github.com/avaloniaui"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        x:Class="KeyKeeper.Views.PasswordDialog"
-        Title="Создание хранилища"
-        Width="350"
-        Height="230">
-
-    <StackPanel Margin="20" VerticalAlignment="Center">
-
-        <TextBlock Text="Set Master Password"
-                   FontSize="16"
-                   FontWeight="Bold"
-                   Margin="0,0,0,15"/>
-
-        <!-- Поле для пароля (звездочки) -->
-        <StackPanel Margin="0,0,0,10">
-            <TextBlock Text="Password:" Margin="0,0,0,5"/>
-            <TextBox x:Name="PasswordBox"
-                     PasswordChar="*"
-                     Width="250"/>
-        </StackPanel>
-
-        <!-- Поле для подтверждения (звездочки) -->
-        <StackPanel Margin="0,0,0,15">
-            <TextBlock Text="Confirm Password:" Margin="0,0,0,5"/>
-            <TextBox x:Name="ConfirmPasswordBox"
-                     PasswordChar="*"
-                     Width="250"/>
-        </StackPanel>
-
-        <!-- Сообщение об ошибке -->
-        <TextBlock x:Name="ErrorText"
-                   Text="Passwords do not match"
-                   Foreground="Red"
-                   FontSize="12"
-                   Margin="0,0,0,10"
-                   IsVisible="False"/>
-
-        <!-- Кнопки -->
-        <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" Spacing="10">
-            <Button Content="Cancel"
-                    Width="80"
-                    Height="30"
-                    Click="CancelButton_Click"/>
-
-            <Button Content="Create"
-                    Width="80"
-                    Height="30"
-                    Click="CreateButton_Click"/>
-        </StackPanel>
-
-    </StackPanel>
-
-</Window>
diff --git a/src/KeyKeeper/Views/PasswordDialog.axaml.cs b/src/KeyKeeper/Views/PasswordDialog.axaml.cs
deleted file mode 100644
index 7e15c00..0000000
--- a/src/KeyKeeper/Views/PasswordDialog.axaml.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-using Avalonia;
-using Avalonia.Controls;
-using Avalonia.Markup.Xaml;
-using Avalonia.Interactivity;
-
-namespace KeyKeeper.Views
-{
-    public partial class PasswordDialog : Window
-    {
-        public string Password { get; private set; } = "";
-        public bool Created { get; private set; } = false;
-
-        public PasswordDialog()
-        {
-            InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
-
-        private void CreateButton_Click(object sender, RoutedEventArgs e)
-        {
-            var passwordBox = this.FindControl<TextBox>("PasswordBox");
-            var confirmBox = this.FindControl<TextBox>("ConfirmPasswordBox");
-            var errorText = this.FindControl<TextBlock>("ErrorText");
-
-            string password = passwordBox?.Text ?? "";
-            string confirmPassword = confirmBox?.Text ?? "";
-
-            if (string.IsNullOrEmpty(password) || string.IsNullOrEmpty(confirmPassword))
-            {
-                ShowError("Password cannot be empty");
-                return;
-            }
-
-            if (password != confirmPassword)
-            {
-                ShowError("Passwords don't match");
-                return;
-            }
-
-            Password = password;
-            Created = true;
-            Close();
-        }
-
-        private void ShowError(string message)
-        {
-            var errorText = this.FindControl<TextBlock>("ErrorText");
-            if (errorText != null)
-            {
-                errorText.Text = message;
-                errorText.IsVisible = true;
-            }
-        }
-
-        private void CancelButton_Click(object sender, RoutedEventArgs e)
-        {
-            Created = false;
-            Close();
-        }
-    }
-}

From 74367480574d2240c391006734122975e3b39a6e Mon Sep 17 00:00:00 2001
From: Slavasil <subvia@proton.me>
Date: Sun, 1 Mar 2026 19:42:29 +0300
Subject: [PATCH 5/6] change color of labels

---
 src/KeyKeeper/Views/CreateVaultDialog.axaml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml b/src/KeyKeeper/Views/CreateVaultDialog.axaml
index 4d00fa8..ec10c2e 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml
@@ -31,7 +31,7 @@
 
 				<!-- Выбор файла -->
 				<StackPanel Spacing="10">
-					<TextBlock Text="File location" FontWeight="SemiBold"/>
+					<TextBlock Text="File location" FontWeight="SemiBold" Foreground="Black" />
 					<Grid ColumnDefinitions="*, Auto" ColumnSpacing="10">
 						<TextBox x:Name="FilePathTextBox"
                                  Grid.Column="0"
@@ -52,7 +52,7 @@
 
 				<!-- Ввод мастер-пароля -->
 				<StackPanel Spacing="10">
-					<TextBlock Text="Master password" FontWeight="SemiBold"/>
+					<TextBlock Text="Master password" FontWeight="SemiBold" Foreground="Black" />
 					<TextBox x:Name="PasswordBox"
                              PasswordChar="*"
                              Watermark="Enter password"
@@ -60,7 +60,7 @@
 				</StackPanel>
 
 				<StackPanel Spacing="10">
-					<TextBlock Text="Confirm password" FontWeight="SemiBold"/>
+					<TextBlock Text="Confirm password" FontWeight="SemiBold" Foreground="Black" />
 					<TextBox x:Name="ConfirmPasswordBox"
                              PasswordChar="*"
                              Watermark="Confirm password"
@@ -90,4 +90,4 @@
 			</StackPanel>
 		</ScrollViewer>
 	</Grid>
-</Window>
\ No newline at end of file
+</Window>

From 175b67b22dd0cb008e96d84d9acde3746c332d9e Mon Sep 17 00:00:00 2001
From: Slavasil <subvia@proton.me>
Date: Sun, 1 Mar 2026 19:42:54 +0300
Subject: [PATCH 6/6] make OnTextChanged async

for some reason before this change the program would stop responding if
  a non-existing path was chosen in the file picker. Maybe the
  .GetAwaiter().GetResult() trick does not work correctly with
  exceptions...
---
 src/KeyKeeper/Views/CreateVaultDialog.axaml.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
index d56b0b4..4f908ab 100644
--- a/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
+++ b/src/KeyKeeper/Views/CreateVaultDialog.axaml.cs
@@ -3,6 +3,7 @@ using Avalonia.Controls;
 using Avalonia.Interactivity;
 using Avalonia.Platform.Storage;
 using System;
+using System.Threading.Tasks;
 
 namespace KeyKeeper.Views
 {
@@ -23,7 +24,7 @@ namespace KeyKeeper.Views
             ConfirmPasswordBox.TextChanged += OnPasswordTextChanged;
         }
 
-        private void OnTextChanged(object? sender, TextChangedEventArgs e)
+        private async void OnTextChanged(object? sender, TextChangedEventArgs e)
         {
             UpdateCreateButtonState();
             PathWarning.Text = "";
@@ -34,7 +35,7 @@ namespace KeyKeeper.Views
 
             try
             {
-                var storageFile = StorageProvider.TryGetFileFromPathAsync(path).GetAwaiter().GetResult();
+                var storageFile = await StorageProvider.TryGetFileFromPathAsync(path);
                 if (storageFile != null)
                 {
                     PathWarning.Text = "File already exists. It will be overwritten.";