diff --git a/PCK-Studio/Forms/Editor/BehaviourEditor.cs b/PCK-Studio/Forms/Editor/BehaviourEditor.cs
index 81bc984e..f19ef875 100644
--- a/PCK-Studio/Forms/Editor/BehaviourEditor.cs
+++ b/PCK-Studio/Forms/Editor/BehaviourEditor.cs
@@ -149,6 +149,7 @@ namespace PckStudio.Forms.Editor
 
 		private void changeToolStripMenuItem_Click(object sender, EventArgs e)
 		{
+			if (treeView1.SelectedNode == null) return;
 			if (!(treeView1.SelectedNode.Tag is BehaviourFile.RiderPositionOverride entry)) return;
 
 			var diag = new Additional_Popups.Behaviours.AddBehaviour();