diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragmentTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragmentTest.kt
index 1f4586c03..5473c6db8 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragmentTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/nav/destination/library/OnlineLibraryFragmentTest.kt
@@ -22,7 +22,6 @@ import androidx.core.content.edit
 import androidx.lifecycle.Lifecycle
 import androidx.preference.PreferenceManager
 import androidx.test.core.app.ActivityScenario
-import androidx.test.espresso.Espresso
 import androidx.test.espresso.accessibility.AccessibilityChecks
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
@@ -101,7 +100,7 @@ class OnlineLibraryFragmentTest : BaseActivityTest() {
       waitForDataToLoad()
       clickOnSearchIcon()
       searchWikipediaZIMFiles()
-      Espresso.closeSoftKeyboard()
+      pressBack()
       clickLibraryOnBottomNav()
       clickDownloadOnBottomNav()
       assertPreviousSearchRemainsActive()
@@ -120,7 +119,7 @@ class OnlineLibraryFragmentTest : BaseActivityTest() {
       clickOnSearchIcon()
       searchWikipediaZIMFiles()
       clickOnClearSearchIcon()
-      Espresso.closeSoftKeyboard()
+      pressBack()
       clickLibraryOnBottomNav()
       clickDownloadOnBottomNav()
       assertSearchViewIsNotActive(kiwixMainActivity)
diff --git a/core/src/main/AndroidManifest.xml b/core/src/main/AndroidManifest.xml
index d8ddfacdf..adf34d1cb 100644
--- a/core/src/main/AndroidManifest.xml
+++ b/core/src/main/AndroidManifest.xml
@@ -52,12 +52,13 @@
   <application
     android:allowBackup="true"
     android:dataExtractionRules="@xml/data_extraction_rules"
+    android:enableOnBackInvokedCallback="false"
     android:fullBackupContent="@xml/backup_rules"
     android:hardwareAccelerated="true"
+    android:hasFragileUserData="true"
     android:largeHeap="true"
     android:requestLegacyExternalStorage="true"
     android:resizeableActivity="true"
-    android:hasFragileUserData="true"
     android:supportsRtl="true"
     android:theme="@style/KiwixTheme"
     tools:targetApi="tiramisu">
@@ -91,6 +92,7 @@
     <activity
       android:name=".error.DiagnosticReportActivity"
       android:exported="false" />
+
     <service android:name=".read_aloud.ReadAloudService" />
     <service
       android:name=".downloader.downloadManager.DownloadMonitorService"