diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
index 5954343447..11c7e7eec1 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml
@@ -14,8 +14,8 @@
         Background="White"
         ResizeMode="NoResize"
         WindowStartupLocation="CenterScreen"
-        Initialized="InitializedEventHandler"
-        Closed="OnClosed">
+        Initialized="OnInitialized"
+        Closing="OnClosing">
     <Window.Resources>
         <Converters:BooleanToBrushConverter x:Key="BooleanToBrushConverter" />
         <Converters:ModelToVisibilityConverter x:Key="ModelToVisibilityConverter" />
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
index 42cb3f3118..b646ab6b00 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
@@ -29,6 +29,9 @@ namespace FancyZonesEditor
         {
             InitializeComponent();
             DataContext = _settings;
+
+            KeyUp += MainWindow_KeyUp;
+
             if (_settings.WorkArea.Height < 900)
             {
                 SizeToContent = SizeToContent.WidthAndHeight;
@@ -36,6 +39,14 @@ namespace FancyZonesEditor
             }
         }
 
+        private void MainWindow_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                OnClosing(sender, null);
+            }
+        }
+
         private void DecrementZones_Click(object sender, RoutedEventArgs e)
         {
             if (_settings.ZoneCount > 1)
@@ -152,7 +163,7 @@ namespace FancyZonesEditor
             }
         }
 
-        private void OnClosed(object sender, EventArgs e)
+        private void OnClosing(object sender, EventArgs e)
         {
             if (!_editing)
             {
@@ -160,7 +171,7 @@ namespace FancyZonesEditor
             }
         }
 
-        private void InitializedEventHandler(object sender, EventArgs e)
+        private void OnInitialized(object sender, EventArgs e)
         {
             SetSelectedItem();
         }