diff --git a/share/qtcreator/qmldesigner/newstateseditor/StateMenu.qml b/share/qtcreator/qmldesigner/newstateseditor/StateMenu.qml
index 8d0bb8810c4..d26572ebde6 100644
--- a/share/qtcreator/qmldesigner/newstateseditor/StateMenu.qml
+++ b/share/qtcreator/qmldesigner/newstateseditor/StateMenu.qml
@@ -87,9 +87,7 @@ StudioControls.Menu {
     StudioControls.MenuItem {
         enabled: !root.isBaseState && root.hasWhenCondition
         text: qsTr("Reset when Condition")
-        onTriggered: {
-           statesEditorModel.resetWhenCondition(internalNodeId)
-        }
+        onTriggered: root.resetWhenCondition()
     }
 
     StudioControls.MenuSeparator {}
diff --git a/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml b/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml
index ba7950781c4..642ebd972d1 100644
--- a/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml
+++ b/share/qtcreator/qmldesigner/newstateseditor/StateThumbnail.qml
@@ -654,7 +654,12 @@ Item {
                         return
 
                     whenCondition.previousCondition = whenCondition.text
-                    root.whenConditionFinished()
+
+                    if (whenCondition.text !== "")
+                        root.whenConditionFinished()
+                    else
+                        statesEditorModel.resetWhenCondition(root.internalNodeId)
+
                 }
 
                 Component.onCompleted: whenCondition.previousCondition = whenCondition.text
@@ -694,6 +699,7 @@ Item {
         onExtend: root.extend()
         onRemove: root.remove()
         onToggle: root.propertyChangesVisible = !root.propertyChangesVisible
+        onResetWhenCondition: statesEditorModel.resetWhenCondition(root.internalNodeId)
         onEditAnnotation: {
             statesEditorModel.setAnnotation(root.internalNodeId)
             stateMenu.hasAnnotation = root.checkAnnotation()