diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml b/src/KeyKeeper/Views/ErrorDialog.axaml
index f21f499..89faf82 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml
@@ -32,13 +32,16 @@
             </StackPanel>
         </StackPanel>
 
-        <!-- Action Button -->
-        <Button Grid.Row="1"
-                Content="Got it"
-                Click="Ok_Click"
-                HorizontalAlignment="Right"
-                Padding="25,8"
-                BorderThickness="0"
+        <!-- Action Button -->
+        <Button Grid.Row="1"
+                x:Name="OkButton"
+                Content="Got it"
+                Click="Ok_Click"
+                IsDefault="True"
+                IsCancel="True"
+                HorizontalAlignment="Right"
+                Padding="25,8"
+                BorderThickness="0"
                 CornerRadius="4"
                 Cursor="Hand">
             <Button.Styles>
diff --git a/src/KeyKeeper/Views/ErrorDialog.axaml.cs b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
index ebcf8a0..584597d 100644
--- a/src/KeyKeeper/Views/ErrorDialog.axaml.cs
+++ b/src/KeyKeeper/Views/ErrorDialog.axaml.cs
@@ -1,5 +1,7 @@
-using Avalonia.Controls;
+using System;
+using Avalonia.Controls;
 using Avalonia.Interactivity;
+using Avalonia.Threading;
 
 namespace KeyKeeper.Views;
 
@@ -16,4 +18,10 @@ public partial class ErrorDialog : Window
     {
         Close();
     }
-}
\ No newline at end of file
+
+    protected override void OnOpened(EventArgs e)
+    {
+        base.OnOpened(e);
+        OkButton.Focus();
+    }
+}