From acadd069e826b7009d3a988a873c73e13938d96f Mon Sep 17 00:00:00 2001
From: Seraphima Zykova <zykovas91@gmail.com>
Date: Mon, 27 Sep 2021 17:35:33 +0300
Subject: [PATCH] [FancyZones Editor] Fix the editor crash  (#13463)

---
 .../fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
index acbb1fd650..bd13556361 100644
--- a/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
+++ b/src/modules/fancyzones/editor/FancyZonesEditor/MainWindow.xaml.cs
@@ -419,7 +419,7 @@ namespace FancyZonesEditor
             {
                 LayoutModel model = element.DataContext as LayoutModel;
 
-                if (model.Guid == _backup.Guid)
+                if (_backup != null && model.Guid == _backup.Guid)
                 {
                     _backup = null;
                 }