diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
index 0f66d75..b4f6645 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/View/LectotypeWindow.xaml.cs
@@ -398,20 +398,27 @@ namespace Sinvo.EplanHpD.Plugin.WPFUI
             { 
                 CloseBefore(() =>
                 {
-                    ViewModel.ClearNotSavedLectotypeList();
-                    var motorFlags = ViewModel.Motors.Where(motor => !motor.IsError).Select(motor => motor.GetUniqueFlag()).ToList();
-                    var window = new LayoutHelperWindow(motorFlags);
-                    //window.MotorIds = motorIds;
-                    ElementHost.EnableModelessKeyboardInterop(window);
-                    var mainApp = BaseApp.ActiveApplication;
-                    var helper = new System.Windows.Interop.WindowInteropHelper(window);
-                    helper.Owner = mainApp.Handle;
-                    window.Show();
-                    this.Close();
+                    ToLayout();
                 });
             }
+            else
+            {
+                ToLayout();
+            }
          
         }
+        private void ToLayout()
+        {
+            ViewModel.ClearNotSavedLectotypeList(); 
+            var window = new LayoutHelperWindow(ViewModel.Motors);
+            //window.MotorIds = motorIds;
+            ElementHost.EnableModelessKeyboardInterop(window);
+            var mainApp = BaseApp.ActiveApplication;
+            var helper = new System.Windows.Interop.WindowInteropHelper(window);
+            helper.Owner = mainApp.Handle;
+            window.Show();
+            this.Close();
+        }
         private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
             if(ViewModel.GetNotSavedLectotypeList() != null && ViewModel.GetNotSavedLectotypeList().Any())