diff --git a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
index 6d0302fed18..1d71bea9cfd 100644
--- a/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
+++ b/src/com/android/settings/deviceinfo/DeviceNamePreferenceController.java
@@ -54,7 +54,9 @@ public class DeviceNamePreferenceController extends BasePreferenceController
     public void displayPreference(PreferenceScreen screen) {
         super.displayPreference(screen);
         mPreference = (ValidatedEditTextPreference) screen.findPreference(PREF_KEY);
-        mPreference.setSummary(getSummary());
+        final CharSequence deviceName = getSummary();
+        mPreference.setSummary(deviceName);
+        mPreference.setText(deviceName.toString());
         mPreference.setValidator(this);
     }
 
diff --git a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
index 5d5fb764b27..a4e097500fb 100644
--- a/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/deviceinfo/DeviceNamePreferenceControllerTest.java
@@ -123,4 +123,12 @@ public class DeviceNamePreferenceControllerTest {
         verify(mWifiManager).setWifiApConfiguration(captor.capture());
         assertThat(captor.getValue().SSID).isEqualTo(TESTING_STRING);
     }
+
+    @Test
+    public void displayPreference_defaultDeviceNameIsModelNameOnPreference() {
+        mController.displayPreference(mScreen);
+
+        assertThat(mPreference.getText()).isEqualTo(Build.MODEL);
+    }
+
 }