diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index f6bbd90d2..ccca1656e 100644
--- a/src/Mod/Sketcher/Gui/CommandConstraints.cpp
+++ b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -67,6 +67,8 @@ ConstraintCreationMode constraintCreationMode=Driving;
 
 void ActivateHandler(Gui::Document *doc,DrawSketchHandler *handler);
 
+bool isCreateGeoActive(Gui::Document *doc);
+
 bool isCreateConstraintActive(Gui::Document *doc)
 {
     if (doc) {
@@ -1197,7 +1199,8 @@ void CmdSketcherConstrainLock::updateAction(int mode)
 
 bool CmdSketcherConstrainLock::isActive(void)
 {
-    return isCreateConstraintActive( getActiveGuiDocument() );
+    //    return isCreateConstraintActive( getActiveGuiDocument() );
+    return isCreateGeoActive( getActiveGuiDocument() );
 }