diff --git a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp
index b6e592c047a..71673a101b4 100644
--- a/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp
+++ b/src/plugins/qmldesigner/components/componentcore/selectioncontext.cpp
@@ -63,7 +63,7 @@ bool SelectionContext::singleNodeIsSelected() const
 
 bool SelectionContext::isInBaseState() const
 {
-    return QmlModelState(view()->currentStateNode()).isBaseState();
+    return view()->currentState().isBaseState();
 }
 
 ModelNode SelectionContext::currentSingleSelectedNode() const
diff --git a/src/plugins/qmldesigner/components/formeditor/movetool.cpp b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
index b47a820fbf4..eda48d12162 100644
--- a/src/plugins/qmldesigner/components/formeditor/movetool.cpp
+++ b/src/plugins/qmldesigner/components/formeditor/movetool.cpp
@@ -95,8 +95,7 @@ void MoveTool::mouseMoveEvent(const QList<QGraphicsItem*> &itemList,
         m_resizeIndicator.hide();
 
         FormEditorItem *containerItem = containerFormEditorItem(itemList, m_movingItems);
-        if (containerItem
-                && QmlModelState::isBaseState(view()->currentStateNode())) {
+        if (containerItem && view()->currentState().isBaseState()) {
             if (containerItem != m_movingItems.first()->parentItem()
                     && event->modifiers().testFlag(Qt::ShiftModifier)) {
                 m_moveManipulator.reparentTo(containerItem);
diff --git a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
index 93a7c45396e..10b6453606b 100644
--- a/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
+++ b/src/plugins/qmldesigner/components/propertyeditor/propertyeditor.cpp
@@ -738,7 +738,7 @@ void PropertyEditor::resetView()
 
     NodeType *type = m_typeHash.value(qmlFile.toString());
 
-    QString currentStateName = QmlModelState::isValidQmlModelState(currentStateNode()) ? QmlModelState(currentStateNode()).name() : QLatin1String("invalid state");
+    QString currentStateName = currentState().isBaseState() ? currentState().name() : QLatin1String("invalid state");
 
     if (!type) {
         type = new NodeType(this);
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
index 1497804e76d..cfc7c929236 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
@@ -245,11 +245,6 @@ void StatesEditorView::duplicateCurrentState()
     setCurrentState(newState);
 }
 
-QmlModelState StatesEditorView::currentState() const
-{
-    return QmlModelState(currentStateNode());
-}
-
 void StatesEditorView::setCurrentState(const QmlModelState &state)
 {
     if (!model() && !state.isValid())
diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
index c36c6f24ecf..c6410505e96 100644
--- a/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
+++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorview.h
@@ -49,7 +49,6 @@ public:
     void renameState(int nodeId,const QString &newName);
     bool validStateName(const QString &name) const;
     QString currentStateName() const;
-    QmlModelState currentState() const;
     void setCurrentState(const QmlModelState &state);
     QmlModelState baseState() const;
     QmlModelStateGroup rootStateGroup() const;
diff --git a/src/plugins/qmldesigner/designercore/include/abstractview.h b/src/plugins/qmldesigner/designercore/include/abstractview.h
index cde3a097094..bb28457338e 100644
--- a/src/plugins/qmldesigner/designercore/include/abstractview.h
+++ b/src/plugins/qmldesigner/designercore/include/abstractview.h
@@ -57,6 +57,7 @@ namespace QmlDesigner {
 
 class NodeInstanceView;
 class RewriterView;
+class QmlModelState;
 
 class WidgetInfo {
 
@@ -235,6 +236,7 @@ public:
 
     void setCurrentStateNode(const ModelNode &node);
     ModelNode currentStateNode() const;
+    QmlModelState currentState() const;
 
     int majorQtQuickVersion() const;
 
diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index fe904548bd8..96c3776e139 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -33,6 +33,7 @@
 #include "model_p.h"
 #include "internalnode_p.h"
 #include "nodeinstanceview.h"
+#include <qmlstate.h>
 
 namespace QmlDesigner {
 
@@ -537,6 +538,11 @@ ModelNode AbstractView::currentStateNode() const
     return ModelNode();
 }
 
+QmlModelState AbstractView::currentState() const
+{
+    return QmlModelState(currentStateNode());
+}
+
 static int getMajorVersionFromImport(const Model *model)
 {
     foreach (const Import &import, model->imports()) {
diff --git a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
index 5d74953b4e1..afd962070ca 100644
--- a/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/qmlitemnode.cpp
@@ -155,7 +155,7 @@ QmlItemNode QmlItemNode::createQmlItemNode(AbstractView *view, const ItemLibrary
 
         newQmlItemNode.setId(view->generateNewId("image"));
 
-        if (!QmlModelState(view->currentStateNode()).isBaseState()) {
+        if (!view->currentState().isBaseState()) {
             newQmlItemNode.modelNode().variantProperty("opacity").setValue(0);
             newQmlItemNode.setVariantProperty("opacity", 1);
         }
@@ -221,7 +221,7 @@ QmlItemNode QmlItemNode::createQmlItemNodeFromImage(AbstractView *view, const QS
 
             newQmlItemNode.setId(view->generateNewId("image"));
 
-            if (!QmlModelState(view->currentStateNode()).isBaseState()) {
+            if (!view->currentState().isBaseState()) {
                 newQmlItemNode.modelNode().variantProperty("opacity").setValue(0);
                 newQmlItemNode.setVariantProperty("opacity", 1);
             }
diff --git a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
index eed353a8ced..7690ccfa3a3 100644
--- a/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
+++ b/src/plugins/qmldesigner/designercore/model/viewmanager.cpp
@@ -67,7 +67,7 @@ void ViewManager::detachRewriterView()
 void ViewManager::switchStateEditorViewToBaseState()
 {
     if (m_statesEditorView.isAttached()) {
-        m_savedState = QmlModelState(m_statesEditorView.currentStateNode());
+        m_savedState = m_statesEditorView.currentState();
         m_statesEditorView.setCurrentState(m_statesEditorView.baseState());
     }
 }