diff --git a/CHANGELOG.md b/CHANGELOG.md
index 645501f..2993985 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+- We have fixed the textinputs hiding behind on-screen keyboard.
+
 ### Changes
 
 -   Migrated from react-native-push-notification to @notifee/react-native for better new architecture compatibility and enhanced push notification features
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 5a67d70..e136e20 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -94,7 +94,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 8e65001..635af5e 100644
--- a/android/app/src/production/AndroidManifest.xml
+++ b/android/app/src/production/AndroidManifest.xml
@@ -10,7 +10,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 570d9b0..0310fdd 100644
--- a/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt
+++ b/android/app/src/production/java/com/mendix/developerapp/MainActivity.kt
@@ -89,7 +89,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()