diff --git a/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.cs b/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.cs
index 830359f2..d51aa2c0 100644
--- a/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.cs
+++ b/Plugins.UserInterface/UniversalEditor.Plugins.RavenSoftware.UserInterface/Editors/Icarus/IcarusScriptEditor.cs
@@ -587,5 +587,15 @@ namespace UniversalEditor.Plugins.RavenSoftware.UserInterface.Editors.Icarus
 				tv.SelectedRows[0].RowColumns[0].Value = GetCommandText(tv.SelectedRows[0].GetExtraData<IcarusCommand>("cmd"));
 			}
 		}
+
+		protected override bool ShowDocumentPropertiesDialogInternal()
+		{
+			if (tv.Focused && tv.SelectedRows.Count > 0)
+			{
+				tv_RowActivated(this, new ListViewRowActivatedEventArgs(tv.SelectedRows[0]));
+				return true;
+			}
+			return base.ShowDocumentPropertiesDialogInternal();
+		}
 	}
 }