diff --git a/src/app/tools/drawTools/vabstractspline.cpp b/src/app/tools/drawTools/vabstractspline.cpp
index 5549da759..9ff70ace0 100644
--- a/src/app/tools/drawTools/vabstractspline.cpp
+++ b/src/app/tools/drawTools/vabstractspline.cpp
@@ -85,9 +85,8 @@ void VAbstractSpline::Disable(bool disable)
 void VAbstractSpline::ChangedActivDraw(const QString &newName)
 {
     VDrawTool::ChangedActivDraw(newName);
-    const bool selectable = (nameActivDraw == newName);
-    this->setEnabled(selectable);
-    emit setEnabledPoint(selectable);
+    this->setEnabled(enabled);
+    emit setEnabledPoint(enabled);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/tools/drawTools/vtoolcut.cpp b/src/app/tools/drawTools/vtoolcut.cpp
index 606bbb09f..45d90d990 100644
--- a/src/app/tools/drawTools/vtoolcut.cpp
+++ b/src/app/tools/drawTools/vtoolcut.cpp
@@ -60,10 +60,8 @@ VToolCut::VToolCut(VPattern *doc, VContainer *data, const quint32 &id, const QSt
 void VToolCut::ChangedActivDraw(const QString &newName)
 {
     VToolPoint::ChangedActivDraw(newName);
-    const bool flag = (nameActivDraw == newName);
-    this->setEnabled(flag);
-    firstCurve->ChangedActivDraw(flag);
-    secondCurve->ChangedActivDraw(flag);
+    firstCurve->ChangedActivDraw(enabled);
+    secondCurve->ChangedActivDraw(enabled);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/tools/drawTools/vtoolline.cpp b/src/app/tools/drawTools/vtoolline.cpp
index a14e2d399..11da97d8f 100644
--- a/src/app/tools/drawTools/vtoolline.cpp
+++ b/src/app/tools/drawTools/vtoolline.cpp
@@ -238,7 +238,7 @@ void VToolLine::Disable(bool disable)
 void VToolLine::ChangedActivDraw(const QString &newName)
 {
     VDrawTool::ChangedActivDraw(newName);
-    this->setEnabled(nameActivDraw == newName);
+    this->setEnabled(enabled);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/tools/drawTools/vtoollinepoint.cpp b/src/app/tools/drawTools/vtoollinepoint.cpp
index 6066602af..2037165b4 100644
--- a/src/app/tools/drawTools/vtoollinepoint.cpp
+++ b/src/app/tools/drawTools/vtoollinepoint.cpp
@@ -70,8 +70,8 @@ VToolLinePoint::~VToolLinePoint()
 void VToolLinePoint::ChangedActivDraw(const QString &newName)
 {
     VToolPoint::ChangedActivDraw(newName);
-    this->setEnabled(nameActivDraw == newName);
-    mainLine->setEnabled(nameActivDraw == newName);
+    this->setEnabled(enabled);
+    mainLine->setEnabled(enabled);
 }
 
 //---------------------------------------------------------------------------------------------------------------------
diff --git a/src/app/tools/drawTools/vtoolpoint.cpp b/src/app/tools/drawTools/vtoolpoint.cpp
index 0b9b202ed..1901ac768 100644
--- a/src/app/tools/drawTools/vtoolpoint.cpp
+++ b/src/app/tools/drawTools/vtoolpoint.cpp
@@ -133,8 +133,8 @@ void VToolPoint::UpdateNamePosition(qreal mx, qreal my)
 void VToolPoint::ChangedActivDraw(const QString &newName)
 {
     VDrawTool::ChangedActivDraw(newName);
-    this->setEnabled(nameActivDraw == newName);
-    namePoint->setEnabled(nameActivDraw == newName);
+    this->setEnabled(enabled);
+    namePoint->setEnabled(enabled);
 }
 
 //---------------------------------------------------------------------------------------------------------------------