diff --git a/meshroom/ui/qml/GraphEditor/GraphEditor.qml b/meshroom/ui/qml/GraphEditor/GraphEditor.qml
index 2cf693ed..633fb93d 100755
--- a/meshroom/ui/qml/GraphEditor/GraphEditor.qml
+++ b/meshroom/ui/qml/GraphEditor/GraphEditor.qml
@@ -420,6 +420,8 @@ Item {
                     onExited: uigraph.hoveredNode = null
 
                     Keys.onDeletePressed: {
+                        if(node.locked)
+                            return
                         if(event.modifiers == Qt.AltModifier)
                             uigraph.removeNodesFrom(node)
                         else
diff --git a/meshroom/ui/qml/main.qml b/meshroom/ui/qml/main.qml
index ed26ce3b..147ef53e 100755
--- a/meshroom/ui/qml/main.qml
+++ b/meshroom/ui/qml/main.qml
@@ -726,7 +726,7 @@ ApplicationWindow {
                 node: _reconstruction.selectedNode
                 property bool computing: _reconstruction.computing
                 // Make NodeEditor readOnly when computing
-                readOnly: node.locked
+                readOnly: node ? node.locked : false
 
                 onAttributeDoubleClicked: workspaceView.viewAttribute(attribute, mouse)
                 onUpgradeRequest: {