diff --git a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
index 8af646da..ee9fda8e 100644
--- a/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
+++ b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UserContentPanel.java
@@ -145,7 +145,7 @@ public class UserContentPanel extends JPanel implements MasterPassword.Listener,
                 incognitoField ), JOptionPane.QUESTION_MESSAGE, JOptionPane.OK_CANCEL_OPTION ) {
             @Override
             public void selectInitialValue() {
-                nameField.requestFocusInWindow();
+                nameField.selectAll();
             }
         } ))
             return;