diff --git a/src/plugins/qmldesigner/designercore/include/modelnode.h b/src/plugins/qmldesigner/designercore/include/modelnode.h
index 19bed05a255..b48161ad315 100644
--- a/src/plugins/qmldesigner/designercore/include/modelnode.h
+++ b/src/plugins/qmldesigner/designercore/include/modelnode.h
@@ -248,7 +248,6 @@ public:
 private: // functions
     Internal::InternalNodePointer internalNode() const;
 
-    void removeLocked();
     bool hasLocked() const;
 
 private: // variables
diff --git a/src/plugins/qmldesigner/designercore/model/modelnode.cpp b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
index d00294b89e0..1eafaf531a1 100644
--- a/src/plugins/qmldesigner/designercore/model/modelnode.cpp
+++ b/src/plugins/qmldesigner/designercore/model/modelnode.cpp
@@ -1241,22 +1241,17 @@ bool ModelNode::hasLocked() const
 
 void ModelNode::setLocked(bool value)
 {
-    setAuxiliaryData(lockedProperty, value);
-
     if (value) {
+        setAuxiliaryData(lockedProperty, true);
         // Remove newly locked node and all its descendants from potential selection
         for (ModelNode node : allSubModelNodesAndThisNode()) {
             node.deselectNode();
             node.removeAuxiliaryData("timeline_expanded");
             node.removeAuxiliaryData("transition_expanded");
         }
-    }
-}
-
-void ModelNode::removeLocked()
-{
-    if (hasLocked())
+    } else {
         removeAuxiliaryData(lockedProperty);
+    }
 }
 
 bool ModelNode::isThisOrAncestorLocked(const ModelNode &node)