diff --git a/SailBoat/SailBoat/DrawningObjects/DrawningBoat.cs b/SailBoat/SailBoat/DrawningObjects/DrawningBoat.cs
index 2df043f..bfc5061 100644
--- a/SailBoat/SailBoat/DrawningObjects/DrawningBoat.cs
+++ b/SailBoat/SailBoat/DrawningObjects/DrawningBoat.cs
@@ -13,9 +13,9 @@ namespace SailBoat.DrawningObjects
     {
         public EntityBoat? EntityBoat { get; protected set; }
 
-        private int _pictureWidth;
+        public int _pictureWidth;
 
-        private int _pictureHeight;
+        public int _pictureHeight;
 
         protected int _startPosX;
 
diff --git a/SailBoat/SailBoat/FormBoatCollection.cs b/SailBoat/SailBoat/FormBoatCollection.cs
index fae8dd5..8ad2e71 100644
--- a/SailBoat/SailBoat/FormBoatCollection.cs
+++ b/SailBoat/SailBoat/FormBoatCollection.cs
@@ -74,6 +74,8 @@ namespace SailBoat
 
         private void AddBoat(DrawningBoat boat)
         {
+            boat._pictureWidth = pictureBoxCollection.Width;
+            boat._pictureHeight = pictureBoxCollection.Height;
             if (listBoxStorages.SelectedIndex == -1) return;
             var obj = _storage[listBoxStorages.SelectedItem.ToString() ?? string.Empty];
             if (obj == null) return;
diff --git a/SailBoat/SailBoat/FormBoatConfig.Designer.cs b/SailBoat/SailBoat/FormBoatConfig.Designer.cs
index c44d43e..6a5581e 100644
--- a/SailBoat/SailBoat/FormBoatConfig.Designer.cs
+++ b/SailBoat/SailBoat/FormBoatConfig.Designer.cs
@@ -125,7 +125,6 @@
             panelPink.Name = "panelPink";
             panelPink.Size = new Size(50, 50);
             panelPink.TabIndex = 1;
-            panelPink.MouseDown += PanelColor_MouseDown;
             // 
             // panelBlack
             // 
@@ -134,7 +133,6 @@
             panelBlack.Name = "panelBlack";
             panelBlack.Size = new Size(50, 50);
             panelBlack.TabIndex = 1;
-            panelBlack.MouseDown += PanelColor_MouseDown;
             // 
             // panelGray
             // 
@@ -143,7 +141,6 @@
             panelGray.Name = "panelGray";
             panelGray.Size = new Size(50, 50);
             panelGray.TabIndex = 1;
-            panelGray.MouseDown += PanelColor_MouseDown;
             // 
             // panelWhite
             // 
@@ -152,7 +149,6 @@
             panelWhite.Name = "panelWhite";
             panelWhite.Size = new Size(50, 50);
             panelWhite.TabIndex = 1;
-            panelWhite.MouseDown += PanelColor_MouseDown;
             // 
             // panelYellow
             // 
@@ -161,7 +157,6 @@
             panelYellow.Name = "panelYellow";
             panelYellow.Size = new Size(50, 50);
             panelYellow.TabIndex = 1;
-            panelYellow.MouseDown += PanelColor_MouseDown;
             // 
             // panelBlue
             // 
@@ -170,7 +165,6 @@
             panelBlue.Name = "panelBlue";
             panelBlue.Size = new Size(50, 50);
             panelBlue.TabIndex = 1;
-            panelBlue.MouseDown += PanelColor_MouseDown;
             // 
             // panelGreen
             // 
@@ -179,7 +173,6 @@
             panelGreen.Name = "panelGreen";
             panelGreen.Size = new Size(50, 50);
             panelGreen.TabIndex = 1;
-            panelGreen.MouseDown += PanelColor_MouseDown;
             // 
             // panelRed
             // 
@@ -188,7 +181,6 @@
             panelRed.Name = "panelRed";
             panelRed.Size = new Size(50, 50);
             panelRed.TabIndex = 0;
-            panelRed.MouseDown += PanelColor_MouseDown;
             // 
             // checkBoxSail
             // 
diff --git a/SailBoat/SailBoat/FormBoatConfig.cs b/SailBoat/SailBoat/FormBoatConfig.cs
index a3f9d88..856afca 100644
--- a/SailBoat/SailBoat/FormBoatConfig.cs
+++ b/SailBoat/SailBoat/FormBoatConfig.cs
@@ -34,6 +34,14 @@ namespace SailBoat
         public FormBoatConfig()
         {
             InitializeComponent();
+            panelBlack.MouseDown += PanelColor_MouseDown;
+            panelPink.MouseDown += PanelColor_MouseDown;
+            panelGray.MouseDown += PanelColor_MouseDown;
+            panelGreen.MouseDown += PanelColor_MouseDown;
+            panelRed.MouseDown += PanelColor_MouseDown;
+            panelWhite.MouseDown += PanelColor_MouseDown;
+            panelYellow.MouseDown += PanelColor_MouseDown;
+            panelBlue.MouseDown += PanelColor_MouseDown;
             buttonCancel.Click += (sender, e) => Close();
         }
 
@@ -99,6 +107,7 @@ namespace SailBoat
                     _boat.EntityBoat.SetBodyColor((Color)e.Data.GetData(typeof(Color)));
                     break;
                 case "labelAdditionalColor":
+                    if (_boat == null) return;
                     (_boat.EntityBoat as EntitySailBoat).setAdditionalColor((Color)e.Data.GetData(typeof(Color)));
                     break;
             }