diff --git a/.gitignore b/.gitignore
index 498c7e32..e686a534 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ build/*.rpm
 build/*.AppImage
 SourceGit.app/
 build.command
+src/Properties/launchSettings.json
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
index 6e45164d..ec0f79c9 100644
--- a/src/App.axaml.cs
+++ b/src/App.axaml.cs
@@ -109,8 +109,13 @@ namespace SourceGit
         {
             if (data is Views.ChromelessWindow window)
             {
-                if (showAsDialog && Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
-                    window.ShowDialog(owner);
+                if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
+                {
+                    if (showAsDialog)
+                        window.ShowDialog(owner);
+                    else
+                        window.Show(owner);
+                }
                 else
                     window.Show();
 
diff --git a/src/Views/About.axaml b/src/Views/About.axaml
index d0dd7b82..bcc133e4 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}">
@@ -67,4 +67,9 @@
       </StackPanel>
     </Grid>
   </Grid>
+
+  <Window.KeyBindings>
+    <KeyBinding Gesture="Escape" Command="{Binding #ThisControl.Close}"/>
+  </Window.KeyBindings>
+
 </v:ChromelessWindow>
diff --git a/src/Views/ConfirmEmptyCommit.axaml b/src/Views/ConfirmEmptyCommit.axaml
index 32a1f2cd..bfa42ef0 100644
--- a/src/Views/ConfirmEmptyCommit.axaml
+++ b/src/Views/ConfirmEmptyCommit.axaml
@@ -12,6 +12,7 @@
                     Title="{DynamicResource Text.Warn}"
                     SizeToContent="WidthAndHeight"
                     CanResize="False"
+                    ShowInTaskbar="False"
                     WindowStartupLocation="CenterOwner">
   <Grid RowDefinitions="Auto,Auto,Auto">
     <!-- TitleBar -->
@@ -64,6 +65,7 @@
               Height="30"
               Margin="4,0"
               Click="CloseWindow"
+              IsCancel="True"
               Content="{DynamicResource Text.Cancel}"
               HorizontalContentAlignment="Center"
               VerticalContentAlignment="Center"/>