diff --git a/src/gui/qgsnewnamedialog.cpp b/src/gui/qgsnewnamedialog.cpp
index 70a8d8c3a375..d0ce7cca5e76 100644
--- a/src/gui/qgsnewnamedialog.cpp
+++ b/src/gui/qgsnewnamedialog.cpp
@@ -76,6 +76,9 @@ QgsNewNameDialog::QgsNewNameDialog( const QString& source, const QString& initia
   mErrorLabel->setWordWrap( true );
   layout()->addWidget( mErrorLabel );
 
+  mLineEdit->setFocus();
+  mLineEdit->selectAll();
+
   nameChanged();
 }