diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt
index 68ee96098..50e705f51 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/page/bookmark/viewmodel/effects/ShowDeleteBookmarksDialog.kt
@@ -25,7 +25,8 @@ import org.kiwix.kiwixmobile.core.dao.NewBookmarksDao
 import org.kiwix.kiwixmobile.core.page.bookmark.BookmarksActivity
 import org.kiwix.kiwixmobile.core.page.bookmark.viewmodel.BookmarkState
 import org.kiwix.kiwixmobile.core.utils.DialogShower
-import org.kiwix.kiwixmobile.core.utils.KiwixDialog
+import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteAllBookmarks
+import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteSelectedBookmarks
 import javax.inject.Inject
 
 data class ShowDeleteBookmarksDialog(
@@ -36,12 +37,7 @@ data class ShowDeleteBookmarksDialog(
   @Inject lateinit var dialogShower: DialogShower
   override fun invokeWith(activity: AppCompatActivity) {
     (activity as BookmarksActivity).activityComponent.inject(this)
-    var dialogType: KiwixDialog = KiwixDialog.DeleteAllBookmarks
-    if (state.isInSelectionState) {
-      dialogType = KiwixDialog.DeleteSelectedBookmarks
-    }
-    dialogShower.show(dialogType, {
-      effects.offer(DeleteBookmarkItems(effects, state, bookmarksDao))
-    })
+    dialogShower.show(if (state.isInSelectionState) DeleteSelectedBookmarks else DeleteAllBookmarks,
+      { effects.offer(DeleteBookmarkItems(effects, state, bookmarksDao)) })
   }
 }
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialog.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialog.kt
index 0fb7591a0..406a67dff 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialog.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/page/history/viewmodel/effects/ShowDeleteHistoryDialog.kt
@@ -25,7 +25,6 @@ import org.kiwix.kiwixmobile.core.dao.HistoryDao
 import org.kiwix.kiwixmobile.core.page.history.HistoryActivity
 import org.kiwix.kiwixmobile.core.page.history.viewmodel.HistoryState
 import org.kiwix.kiwixmobile.core.utils.DialogShower
-import org.kiwix.kiwixmobile.core.utils.KiwixDialog
 import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteAllHistory
 import org.kiwix.kiwixmobile.core.utils.KiwixDialog.DeleteSelectedHistory
 import javax.inject.Inject
@@ -38,11 +37,7 @@ data class ShowDeleteHistoryDialog(
   @Inject lateinit var dialogShower: DialogShower
   override fun invokeWith(activity: AppCompatActivity) {
     (activity as HistoryActivity).activityComponent.inject(this)
-    var dialogType: KiwixDialog = DeleteAllHistory
-    if (state.isInSelectionState) {
-      dialogType = DeleteSelectedHistory
-    }
-    dialogShower.show(dialogType, {
+    dialogShower.show(if (state.isInSelectionState) DeleteSelectedHistory else DeleteAllHistory, {
       effects.offer(DeleteHistoryItems(state, historyDao))
     })
   }