diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
index 2ab491bd..da756b77 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Dialogs/NewDialog.cs
@@ -158,9 +158,17 @@ namespace UniversalEditor.UserInterface.Dialogs
 		{
 			base.OnCreating(e);
 
+			tvTemplate.RowActivated += tvTemplate_RowActivated;
+
 			InitializeTreeView();
 		}
 
+		private void tvTemplate_RowActivated (object sender, ListViewRowActivatedEventArgs e)
+		{
+			cmdOK_Click (sender, e);
+		}
+
+
 		private void InitializeTreeView()
 		{
 			switch (this.Mode)
@@ -484,6 +492,7 @@ namespace UniversalEditor.UserInterface.Dialogs
 
 		private void cmdOK_Click(object sender, EventArgs e)
 		{
+			this.DialogResult = DialogResult.OK;
 			/*
 			if (String.IsNullOrEmpty(this.txtFileName.Text))
 			{