Merge master into multisessiondebugging

1 files changed, 10 insertions, 7 deletions

diff --git a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/RunConfigurationsPanel.cs b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/RunConfigurationsPanel.cs
index d8bbb288ba..02e18a8ba3 100644
--- a/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/RunConfigurationsPanel.cs
+++ b/main/src/core/MonoDevelop.Ide/MonoDevelop.Ide.Projects.OptionPanels/RunConfigurationsPanel.cs
@@ -306,8 +306,8 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 		public RunConfigurationNameDialog (Xwt.WindowFrame parent, string name, Command action, IEnumerable<string> invalidNames)
 		{
 			TransientFor = parent;
-			this.Resizable = false;
 			Resizable = false;
+			Width = 300;
 			this.invalidNames = invalidNames;
 			mainBox = new VBox ();
 			var box = new HBox ();
@@ -321,16 +321,13 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 			Buttons.Add (new DialogButton (Command.Cancel));
 			Buttons.Add (okButton = new DialogButton (action));
 			this.DefaultCommand = okButton.Command;
-			entry.KeyReleased+= Entry_KeyReleased;
+			entry.Activated += Entry_Activated;
 			entry.Changed += (s, o) => UpdateControls ();
-			UpdateControls ();
 		}
 
-		void Entry_KeyReleased (object sender, KeyEventArgs e)
+		void Entry_Activated (object sender, EventArgs e)
 		{
-			if (e.Key == Key.Return && e.Modifiers == ModifierKeys.None) {
-				OnCommandActivated (okButton.Command);
-			}
+			OnCommandActivated (okButton.Command);
 		}
 
 		void UpdateControls ()
@@ -338,6 +335,12 @@ namespace MonoDevelop.Ide.Projects.OptionPanels
 			okButton.Sensitive = entry.Text.Length > 0;
 		}
 
+		protected override void OnShown ()
+		{
+			UpdateControls ();
+			base.OnShown ();
+		}
+
 		public string NewName {
 			get { return entry.Text; }
 		}