diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 00af8fdd303..6669fb5aea3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,6 +47,7 @@
     <activity
       android:name=".profile.PinPasswordActivity"
       android:screenOrientation="portrait"
+      android:windowSoftInputMode="adjustResize"
       android:theme="@style/OppiaThemeWithoutActionBar" />
     <activity
       android:name=".profile.ProfileActivity"
diff --git a/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt b/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt
index 1564d58112d..327345436b9 100644
--- a/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/app/profile/PinPasswordActivityPresenter.kt
@@ -51,6 +51,7 @@ class PinPasswordActivityPresenter @Inject constructor(
       pinViewModel.showPassword.set(!pinViewModel.showPassword.get()!!)
     }
 
+    binding.inputPin.requestFocus()
     binding.inputPin.addTextChangedListener(object: TextWatcher {
       var wrong = false
       override fun onTextChanged(pin: CharSequence?, start: Int, before: Int, count: Int) {
diff --git a/app/src/sharedTest/java/org/oppia/app/profile/PinPasswordActivityTest.kt b/app/src/sharedTest/java/org/oppia/app/profile/PinPasswordActivityTest.kt
index 87ccd486833..6817a2abd17 100644
--- a/app/src/sharedTest/java/org/oppia/app/profile/PinPasswordActivityTest.kt
+++ b/app/src/sharedTest/java/org/oppia/app/profile/PinPasswordActivityTest.kt
@@ -14,6 +14,7 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.intent.Intents
 import androidx.test.espresso.intent.Intents.intended
 import androidx.test.espresso.intent.matcher.IntentMatchers.hasComponent
+import androidx.test.espresso.matcher.ViewMatchers.hasFocus
 import androidx.test.espresso.matcher.ViewMatchers.isDescendantOfA
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
@@ -77,6 +78,13 @@ class PinPasswordActivityTest {
       .inject(this)
   }
 
+  @Test
+  fun testPinPasswordActivityWithAdmin_checkKeyboardIsVisibleByDefault() {
+    ActivityScenario.launch<PinPasswordActivity>(PinPasswordActivity.createPinPasswordActivityIntent(context, adminPin, adminId)).use {
+      onView(withId(R.id.input_pin)).check(matches(hasFocus()))
+    }
+  }
+
   @Test
   fun testPinPasswordActivityWithAdmin_inputCorrectPin_checkOpensHomeActivity() {
     ActivityScenario.launch<PinPasswordActivity>(PinPasswordActivity.createPinPasswordActivityIntent(context, adminPin, adminId)).use {