diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 6e45164d..5cb53a5c 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -109,11 +109,13 @@ namespace SourceGit
         {
             if (data is Views.ChromelessWindow window)
             {
-                if (showAsDialog && Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
-                    window.ShowDialog(owner);
-                else
-                    window.Show();
-
+                if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
+                {
+                    if (showAsDialog)
+                        window.ShowDialog(owner);
+                    else
+                        window.Show(owner);
+                }
                 return;
             }
 
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index d0dd7b82..ae32ddf4 100644
--- a/src/Views/About.axaml
+++ b/src/Views/About.axaml
@@ -10,7 +10,7 @@
                     Title="{DynamicResource Text.About}"
                     Width="520" Height="230"
                     CanResize="False"
-                    WindowStartupLocation="CenterScreen">
+                    WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,*">
     <!-- TitleBar -->
     <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">