diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml.cs
index b486e52636..356cb7b177 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/CanvasEditorWindow.xaml.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Windows;
+using System.Windows.Input;
 using FancyZonesEditor.Models;
 
 namespace FancyZonesEditor
@@ -15,6 +16,9 @@ namespace FancyZonesEditor
         public CanvasEditorWindow()
         {
             InitializeComponent();
+
+            KeyUp += CanvasEditorWindow_KeyUp;
+
             _model = EditorOverlay.Current.DataContext as CanvasLayoutModel;
             _stashedModel = (CanvasLayoutModel)_model.Clone();
         }
@@ -41,6 +45,14 @@ namespace FancyZonesEditor
             _stashedModel.RestoreTo(_model);
         }
 
+        private void CanvasEditorWindow_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                OnCancel(sender, null);
+            }
+        }
+
         private int _offset = 100;
         private CanvasLayoutModel _model;
         private CanvasLayoutModel _stashedModel;
diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs
index bd49bd058c..3f9b43af11 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/GridEditorWindow.xaml.cs
@@ -3,6 +3,7 @@
 // See the LICENSE file in the project root for more information.
 
 using System.Windows;
+using System.Windows.Input;
 using FancyZonesEditor.Models;
 
 namespace FancyZonesEditor
@@ -15,6 +16,9 @@ namespace FancyZonesEditor
         public GridEditorWindow()
         {
             InitializeComponent();
+
+            KeyUp += GridEditorWindow_KeyUp;
+
             _stashedModel = (GridLayoutModel)(EditorOverlay.Current.DataContext as GridLayoutModel).Clone();
         }
 
@@ -25,6 +29,14 @@ namespace FancyZonesEditor
             _stashedModel.RestoreTo(model);
         }
 
+        private void GridEditorWindow_KeyUp(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Escape)
+            {
+                OnCancel(sender, null);
+            }
+        }
+
         private GridLayoutModel _stashedModel;
     }
 }