diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
index 379a37474..b6f7b5412 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/ZimManageViewModel.kt
@@ -19,9 +19,7 @@
 package org.kiwix.kiwixmobile.zim_manager
 
 import android.app.Application
-import android.content.Context
 import androidx.annotation.VisibleForTesting
-import androidx.appcompat.view.ActionMode
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import io.reactivex.Flowable
@@ -112,6 +110,8 @@ class ZimManageViewModel @Inject constructor(
   val requestFiltering = BehaviorProcessor.createDefault<String>("")
   val currentPage = PublishProcessor.create<Int>()
 
+  val libraryFragmentIsVisible = currentPage.filter { it == 1 }
+
   private val compositeDisposable = CompositeDisposable()
 
   init {
@@ -146,12 +146,6 @@ class ZimManageViewModel @Inject constructor(
     )
   }
 
-  fun actionMode(actionMode: ActionMode?) {
-    currentPage.filter { it == 1 }.subscribe {
-      actionMode?.finish()
-    }
-  }
-
   private fun fileSelectActions() = fileSelectActions.subscribe({
     sideEffects.offer(
       when (it) {
diff --git a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
index 41f62bea5..c12c8a604 100644
--- a/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
+++ b/app/src/main/java/org/kiwix/kiwixmobile/zim_manager/fileselect_view/ZimFileSelectFragment.kt
@@ -112,9 +112,7 @@ class ZimFileSelectFragment : BaseFragment() {
       zimManageViewModel.fileSelectActions.offer(FileSelectActions.RestartActionMode)
     }
 
-    zimManageViewModel.currentPage.subscribe {
-      zimManageViewModel.actionMode(actionMode)
-    }
+    disposable.add(zimManageViewModel.libraryFragmentIsVisible.subscribe { actionMode?.finish() })
   }
 
   private fun sideEffects() = zimManageViewModel.sideEffects.subscribe(