diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt
index 1bbb42e38..901dd6d28 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.kt
@@ -191,21 +191,22 @@ class BookmarksActivity : BaseActivity(),
   }
 
   override fun onOptionsItemSelected(item: MenuItem): Boolean {
-    val itemId = item.itemId
-    if (itemId == android.R.id.home) {
-      onBackPressed()
-      return true
-    } else if (itemId == R.id.menu_bookmarks_clear) {
-      dialogShower!!.show(KiwixDialog.DeleteBookmarks, {
-        presenter!!.deleteBookmarks(ArrayList(allBookmarks))
-        allBookmarks.clear()
-        bookmarksList.clear()
-        bookmarksAdapter!!.notifyDataSetChanged()
-        Snackbar.make(noBookmarks!!, R.string.all_bookmarks_cleared, Snackbar.LENGTH_SHORT).show()
-      })
-      return true
+    when (item.itemId) {
+      android.R.id.home -> {
+        onBackPressed()
+      }
+      R.id.menu_bookmarks_clear -> {
+        dialogShower!!.show(KiwixDialog.DeleteBookmarks, {
+          presenter!!.deleteBookmarks(ArrayList(allBookmarks))
+          allBookmarks.clear()
+          bookmarksList.clear()
+          bookmarksAdapter!!.notifyDataSetChanged()
+          Snackbar.make(noBookmarks!!, R.string.all_bookmarks_cleared, Snackbar.LENGTH_SHORT).show()
+        })
+      }
+      else -> return super.onOptionsItemSelected(item)
     }
-    return super.onOptionsItemSelected(item)
+    return true
   }
 
   override fun onDestroy() {
diff --git a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt
index f7bfdb9b2..a804fc8b3 100644
--- a/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt
+++ b/core/src/main/java/org/kiwix/kiwixmobile/core/di/components/CoreComponent.kt
@@ -39,7 +39,6 @@ import org.kiwix.kiwixmobile.core.data.local.dao.BookmarksDao
 import org.kiwix.kiwixmobile.core.data.remote.KiwixService
 import org.kiwix.kiwixmobile.core.di.modules.ApplicationModule
 import org.kiwix.kiwixmobile.core.di.modules.CoreViewModelModule
-import org.kiwix.kiwixmobile.core.di.modules.DialogModule
 import org.kiwix.kiwixmobile.core.di.modules.JNIModule
 import org.kiwix.kiwixmobile.core.di.modules.NetworkModule
 import org.kiwix.kiwixmobile.core.di.modules.SearchModule
@@ -67,8 +66,7 @@ import javax.inject.Singleton
     JNIModule::class,
     DataModule::class,
     CoreViewModelModule::class,
-    SearchModule::class,
-    DialogModule::class
+    SearchModule::class
   ]
 )
 interface CoreComponent {