diff --git a/src/Mod/Sketcher/Gui/DrawSketchHandlerText.h b/src/Mod/Sketcher/Gui/DrawSketchHandlerText.h
index 1ca1ab89d9..fb65bb44c7 100644
--- a/src/Mod/Sketcher/Gui/DrawSketchHandlerText.h
+++ b/src/Mod/Sketcher/Gui/DrawSketchHandlerText.h
@@ -591,7 +591,7 @@ void DSHTextController::computeNextDrawSketchHandlerMode()
             auto& firstParam = onViewParameters[OnViewParameter::First];
             auto& secondParam = onViewParameters[OnViewParameter::Second];
 
-            if (firstParam->isSet && secondParam->isSet) {
+            if (firstParam->hasFinishedEditing && secondParam->hasFinishedEditing) {
                 handler->setNextState(SelectMode::SeekSecond);
             }
         } break;