diff --git a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
index 87f516dcbd..14bbf4a019 100644
--- a/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
+++ b/src/Main/Base/Project/Src/Gui/Components/ExtTreeView/ExtTreeView.cs
@@ -151,13 +151,15 @@ namespace ICSharpCode.SharpDevelop.Gui
 		
 		protected override bool ProcessCmdKey(ref Message msg, Keys keyData)
 		{
-			switch (keyData) {
-				case Keys.F2:
-					StartLabelEdit(SelectedNode as ExtTreeNode);
-					break;
-				case Keys.Delete:
-					DeleteNode(SelectedNode as ExtTreeNode);
-					break;
+			if (!SelectedNode.IsEditing) {
+				switch (keyData) {
+					case Keys.F2:
+						StartLabelEdit(SelectedNode as ExtTreeNode);
+						break;
+					case Keys.Delete:
+						DeleteNode(SelectedNode as ExtTreeNode);
+						break;
+				}
 			}
 			return base.ProcessCmdKey(ref msg, keyData);
 		}