diff --git a/CHANGELOG.android.txt b/CHANGELOG.android.txt
index 65e7ee24..a5b64365 100755
--- a/CHANGELOG.android.txt
+++ b/CHANGELOG.android.txt
@@ -1,2 +1,3 @@
+- We have fixed the textinputs hiding behind on-screen keyboard.
 - We have fixed checking and asking for `read-media` permissions on Android devices using SDK 33+.
 - We have improved the UI for users who use three-button navigation when edge-to-edge mode is enabled.
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 1e3a6c73..930a60fa 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -81,7 +81,7 @@
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode|fontScale"
                 android:launchMode="singleTask"
                 android:screenOrientation="user"
-                android:windowSoftInputMode="stateHidden"
+                android:windowSoftInputMode="adjustPan"
                 android:exported="true">
             <intent-filter>
                 <action android:name="com.mendix.mendixnative.action.START"/>
diff --git a/android/app/src/production/AndroidManifest.xml b/android/app/src/production/AndroidManifest.xml
index 9467bb0a..5d81662e 100644
--- a/android/app/src/production/AndroidManifest.xml
+++ b/android/app/src/production/AndroidManifest.xml
@@ -8,7 +8,7 @@
             android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode|fontScale"
             android:launchMode="singleTask"
             android:screenOrientation="user"
-            android:windowSoftInputMode="stateHidden"
+            android:windowSoftInputMode="adjustPan"
             android:exported="true">
             <intent-filter>
                 <action android:name="com.mendix.mendixnative.action.START" />
diff --git a/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt b/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt
index d0c63e78..075b5060 100644
--- a/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt
+++ b/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt
@@ -91,7 +91,7 @@ class MainActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler, LaunchS
         preferences = AppPreferences(applicationContext)
         devAppPreferences = getPreferences(MODE_PRIVATE)
 
-        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE)
+        window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN)
 
         setupHomeViewModel()
         setupNavigation()