diff --git a/app/src/main/java/org/koitharu/kotatsu/sync/ui/SyncAuthActivity.kt b/app/src/main/java/org/koitharu/kotatsu/sync/ui/SyncAuthActivity.kt
index cf24fb7b9..b4bf3a2a6 100644
--- a/app/src/main/java/org/koitharu/kotatsu/sync/ui/SyncAuthActivity.kt
+++ b/app/src/main/java/org/koitharu/kotatsu/sync/ui/SyncAuthActivity.kt
@@ -84,12 +84,14 @@ class SyncAuthActivity : BaseActivity<ActivitySyncAuthBinding>(), View.OnClickLi
 				binding.groupLogin.isVisible = false
 				binding.groupPassword.isVisible = true
 				pageBackCallback.update()
+				binding.editPassword.requestFocus()
 			}
 
 			R.id.button_back -> {
 				binding.groupPassword.isVisible = false
 				binding.groupLogin.isVisible = true
 				pageBackCallback.update()
+				binding.editEmail.requestFocus()
 			}
 
 			R.id.button_done -> {
@@ -200,6 +202,7 @@ class SyncAuthActivity : BaseActivity<ActivitySyncAuthBinding>(), View.OnClickLi
 		override fun handleOnBackPressed() {
 			binding.groupLogin.isVisible = true
 			binding.groupPassword.isVisible = false
+			binding.editEmail.requestFocus()
 			update()
 		}