diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerRobot.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerRobot.kt
index bccda96ce..e4faf11e9 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerRobot.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerRobot.kt
@@ -44,10 +44,6 @@ fun copyMoveFileHandler(func: CopyMoveFileHandlerRobot.() -> Unit) =
 
 class CopyMoveFileHandlerRobot : BaseRobot() {
 
-  fun assertCopyMovePermissionDialogDisplayed() {
-    isVisible(TextId(R.string.move_files_permission_dialog_title))
-  }
-
   fun assertCopyMoveDialogDisplayed() {
     isVisible(TextId(R.string.copy_move_files_dialog_description))
   }
diff --git a/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerTest.kt b/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerTest.kt
index f67741105..f192f6ab1 100644
--- a/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerTest.kt
+++ b/app/src/androidTest/java/org/kiwix/kiwixmobile/localLibrary/CopyMoveFileHandlerTest.kt
@@ -113,12 +113,14 @@ class CopyMoveFileHandlerTest : BaseActivityTest() {
       }
       copyMoveFileHandler(CopyMoveFileHandlerRobot::pauseForBetterTestPerformance)
       // test with first launch
-      sharedPreferenceUtil.copyMoveZimFilePermissionDialog = false
+      sharedPreferenceUtil.shouldShowStorageSelectionDialog = true
       showMoveFileToPublicDirectoryDialog()
       // should show the permission dialog.
       copyMoveFileHandler {
-        assertCopyMovePermissionDialogDisplayed()
+        assertCopyMoveDialogDisplayed()
         clickOnCopy()
+        assertStorageSelectionDialogDisplayed()
+        clickOnInternalStorage()
         assertZimFileCopiedAndShowingIntoTheReader()
       }
       assertZimFileAddedInTheLocalLibrary()
@@ -150,12 +152,14 @@ class CopyMoveFileHandlerTest : BaseActivityTest() {
       }
       copyMoveFileHandler(CopyMoveFileHandlerRobot::pauseForBetterTestPerformance)
       // test with first launch
-      sharedPreferenceUtil.copyMoveZimFilePermissionDialog = false
+      sharedPreferenceUtil.shouldShowStorageSelectionDialog = true
       showMoveFileToPublicDirectoryDialog()
       // should show the permission dialog.
       copyMoveFileHandler {
-        assertCopyMovePermissionDialogDisplayed()
+        assertCopyMoveDialogDisplayed()
         clickOnMove()
+        assertStorageSelectionDialogDisplayed()
+        clickOnInternalStorage()
         assertZimFileCopiedAndShowingIntoTheReader()
       }
       assertZimFileAddedInTheLocalLibrary()
@@ -198,7 +202,8 @@ class CopyMoveFileHandlerTest : BaseActivityTest() {
         navHostFragment.childFragmentManager.fragments[0] as LocalLibraryFragment
       localLibraryFragment.copyMoveFileHandler?.showMoveFileToPublicDirectoryDialog(
         Uri.fromFile(selectedFile),
-        DocumentFile.fromFile(selectedFile)
+        DocumentFile.fromFile(selectedFile),
+        fragmentManager = localLibraryFragment.parentFragmentManager
       )
     }
   }
@@ -307,7 +312,7 @@ class CopyMoveFileHandlerTest : BaseActivityTest() {
       }
       copyMoveFileHandler(CopyMoveFileHandlerRobot::pauseForBetterTestPerformance)
       sharedPreferenceUtil.apply {
-        copyMoveZimFilePermissionDialog = true
+        shouldShowStorageSelectionDialog = false
         setIsPlayStoreBuildType(true)
       }
       // test opening images