diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/EditorWindow.cs b/src/modules/fancyzones/editor/FancyZonesEditor/EditorWindow.cs
index c3123401eb..b163f5bc16 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/EditorWindow.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/EditorWindow.cs
@@ -21,14 +21,14 @@ namespace FancyZonesEditor
 
             LayoutModel.SerializeDeletedCustomZoneSets();
 
-            _choosing = true;
+            _backToLayoutPicker = false;
             Close();
             EditorOverlay.Current.Close();
         }
 
         protected void OnClosed(object sender, EventArgs e)
         {
-            if (!_choosing)
+            if (_backToLayoutPicker)
             {
                 EditorOverlay.Current.ShowLayoutPicker();
             }
@@ -36,11 +36,10 @@ namespace FancyZonesEditor
 
         protected void OnCancel(object sender, RoutedEventArgs e)
         {
-            _choosing = true;
+            _backToLayoutPicker = true;
             Close();
-            EditorOverlay.Current.ShowLayoutPicker();
         }
 
-        private bool _choosing = false;
+        private bool _backToLayoutPicker = true;
     }
 }