diff --git a/src/Main/Base/Project/Src/Editor/Dialogs/RenameSymbolDialog.xaml.cs b/src/Main/Base/Project/Src/Editor/Dialogs/RenameSymbolDialog.xaml.cs
index 16a71c429e..580ea9ff5f 100644
--- a/src/Main/Base/Project/Src/Editor/Dialogs/RenameSymbolDialog.xaml.cs
+++ b/src/Main/Base/Project/Src/Editor/Dialogs/RenameSymbolDialog.xaml.cs
@@ -42,6 +42,7 @@ namespace ICSharpCode.SharpDevelop.Editor.Dialogs
 			
 			// Set focus into TextBox
 			this.symbolNameTextBox.Focus();
+			this.IsVisibleChanged += (sender, e) => this.symbolNameTextBox.SelectAll();
 		}
 		
 		public string OldSymbolName