diff --git a/rewrite.yml b/rewrite.yml
deleted file mode 100644
index e03ac9b..0000000
--- a/rewrite.yml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-type: specs.openrewrite.org/v1beta/recipe
-name: cz.kamma.kfmanager.UpgradeToJava21
-displayName: Upgrade to Java 21
-description: Upgrade the project to Java 21 using OpenRewrite.
-recipeList:
-  - org.openrewrite.java.migrate.UpgradeToJava21
diff --git a/src/main/java/cz/kamma/kfmanager/ui/SettingsDialog.java b/src/main/java/cz/kamma/kfmanager/ui/SettingsDialog.java
index 859bf24..1e85d71 100644
--- a/src/main/java/cz/kamma/kfmanager/ui/SettingsDialog.java
+++ b/src/main/java/cz/kamma/kfmanager/ui/SettingsDialog.java
@@ -1,6 +1,7 @@
 package cz.kamma.kfmanager.ui;
 
 import java.awt.BorderLayout;
+import java.awt.event.KeyEvent;
 import java.awt.CardLayout;
 import java.awt.Color;
 import java.awt.Component;
@@ -24,6 +25,7 @@ import javax.swing.Box;
 import javax.swing.BoxLayout;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
+import javax.swing.KeyStroke;
 import javax.swing.JCheckBox;
 import javax.swing.JColorChooser;
 import javax.swing.JComboBox;
@@ -297,6 +299,11 @@ public class SettingsDialog extends JDialog {
         btns.add(cancel);
         add(btns, BorderLayout.SOUTH);
 
+        // Close on Escape
+        getRootPane().registerKeyboardAction(e -> cancel.doClick(),
+                KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0),
+                JComponent.WHEN_IN_FOCUSED_WINDOW);
+
         // Ensure dialog has focus when opened
         addWindowListener(new java.awt.event.WindowAdapter() {
             @Override