diff --git a/android/app/src/main/java/me/kavishdevar/librepods/presentation/screens/RenameScreen.kt b/android/app/src/main/java/me/kavishdevar/librepods/presentation/screens/RenameScreen.kt
index c1fb2e03..d06177b6 100644
--- a/android/app/src/main/java/me/kavishdevar/librepods/presentation/screens/RenameScreen.kt
+++ b/android/app/src/main/java/me/kavishdevar/librepods/presentation/screens/RenameScreen.kt
@@ -68,8 +68,9 @@ fun RenameScreen(viewModel: AirPodsViewModel) {
         ) {
             Spacer(modifier = Modifier.height(spacerHeight))
 
-            val textFieldState = rememberTextFieldState()
-            textFieldState.edit { sharedPreferences.getString("name", "") ?: "" }
+            val name = sharedPreferences.getString("name", "")?: ""
+            val textFieldState = rememberTextFieldState(initialText = name)
+            
             LaunchedEffect(textFieldState.text) {
                 sharedPreferences.edit {putString("name", textFieldState.text as String?)}
                 viewModel.setName(textFieldState.text.toString())