diff --git a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
index a558fbc75620f947b092f53d63ff7add11b1fb0d..640fb695a33ed1f9ddb980007ef3e32694d2190a 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
+++ b/src/plugins/qmldesigner/components/stateseditor/stateslist.qml
@@ -35,7 +35,9 @@ Rectangle {
         hoverEnabled:true
         onExited: root.unFocus();
     }
-    onCurrentStateIndexChanged: unFocus();
+    onCurrentStateIndexChanged: {
+        if (currentStateIndex<0) currentStateIndex=0; else unFocus();
+    }
 
     // Colors
     SystemPalette { id:systemPalette; }