diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index efc821b8740..303604c2fc4 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -3197,6 +3197,9 @@ void PropertyEditor::_item_edited() {
 
 
 	TreeItem * item = tree->get_edited();
+	if (!item)
+		return; //it all happened too fast..
+
 	Dictionary d = item->get_metadata(0);
 
 	String name=d["name"];