diff --git a/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java b/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
index c67fe338ffa..c6eb0c8ad6f 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageRenameFragment.java
@@ -68,6 +68,7 @@ public class StorageRenameFragment extends InstrumentedDialogFragment {
         final View view = dialogInflater.inflate(R.layout.dialog_edittext, null, false);
         final EditText nickname = (EditText) view.findViewById(R.id.edittext);
         nickname.setText(rec.getNickname());
+        nickname.requestFocus();
 
         return builder.setTitle(R.string.storage_rename_title)
                 .setView(view)