diff --git a/share/qtcreator/qmldesigner/newstateseditor/Main.qml b/share/qtcreator/qmldesigner/newstateseditor/Main.qml
index 7f20190322a..6be44417a3b 100644
--- a/share/qtcreator/qmldesigner/newstateseditor/Main.qml
+++ b/share/qtcreator/qmldesigner/newstateseditor/Main.qml
@@ -264,7 +264,10 @@ Rectangle {
 
     Connections {
         target: statesEditorModel
-        onModelReset: root.menuOpen = 0
+        function onModelReset() {
+            root.menuOpen = 0
+            editDialog.close()
+        }
     }
 
     // This timer is used to delay the current state animation as it didn't work due to the