From f9ff8f05a54df196882c04cfdc30cace6dacbe74 Mon Sep 17 00:00:00 2001
From: Chernykh Aleksandr <dernet4@gmail.com>
Date: Fri, 7 Nov 2025 16:48:40 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BD=D0=BE=D0=BF=D0=BA=D0=B0=20=D0=BD?=
 =?UTF-8?q?=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5=D0=BA=20=D1=82=D0=B5=D0=BF?=
 =?UTF-8?q?=D0=B5=D1=80=D1=8C=20=D0=B2=20=D0=B2=D0=B5=D1=80=D1=85=D0=BD?=
 =?UTF-8?q?=D0=B5=D0=BC=20=D0=BB=D0=B5=D0=B2=D0=BE=D0=BC=20=D1=83=D0=B3?=
 =?UTF-8?q?=D0=BB=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/KeyKeeper/ViewModels/MainWindowViewModel.cs | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/KeyKeeper/ViewModels/MainWindowViewModel.cs b/src/KeyKeeper/ViewModels/MainWindowViewModel.cs
index b95e069..2a13c50 100644
--- a/src/KeyKeeper/ViewModels/MainWindowViewModel.cs
+++ b/src/KeyKeeper/ViewModels/MainWindowViewModel.cs
@@ -1,17 +1,22 @@
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
 using KeyKeeper.Views;
+using Avalonia.Controls;
 
 namespace KeyKeeper.ViewModels;
-
 public partial class MainWindowViewModel : ViewModelBase
 {
     public string Greeting { get; } = "Welcome to Avalonia!";
-
     [RelayCommand]
-    private void OpenSettings()
+    private async void OpenSettings()
     {
         var settingsWindow = new SettingsWindow();
-        settingsWindow.Show();
+        await settingsWindow.ShowDialog(GetMainWindow());
+    }
+    private static Window? GetMainWindow()
+    {
+        return App.Current?.ApplicationLifetime is Avalonia.Controls.ApplicationLifetimes.IClassicDesktopStyleApplicationLifetime desktop
+            ? desktop.MainWindow
+            : null;
     }
 }