diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
index fcd8d7f59a01..edbbf9db6095 100644
--- a/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
+++ b/AnkiDroid/src/main/java/com/ichi2/anki/CardBrowser.kt
@@ -1058,8 +1058,8 @@ open class CardBrowser :
             showBackIcon()
             increaseHorizontalPaddingOfOverflowMenuIcons(menu)
         }
-        // Append note editor menu to card browser menu if fragmented
-        if (fragmented) {
+        // Append note editor menu to card browser menu if fragmented and deck is not empty
+        if (fragmented && viewModel.rowCount != 0) {
             fragment?.onCreateMenu(menu, menuInflater)
         }
         actionBarMenu?.findItem(R.id.action_undo)?.run {
@@ -1670,8 +1670,17 @@ open class CardBrowser :
     private fun redrawAfterSearch() {
         Timber.i("CardBrowser:: Completed searchCards() Successfully")
         updateList()
-        currentCardId = viewModel.cards[0].id
-        loadNoteEditorFragmentIfFragmented(editNoteLauncher)
+        // Check whether deck is empty or not
+        val isDeckEmpty = viewModel.rowCount == 0
+        // Hide note editor frame if deck is empty and fragmented
+        noteEditorFrame?.visibility = if (fragmented && !isDeckEmpty) {
+            currentCardId = viewModel.cards[0].id
+            loadNoteEditorFragmentIfFragmented(editNoteLauncher)
+            View.VISIBLE
+        } else {
+            invalidateOptionsMenu()
+            View.GONE
+        }
         /*check whether mSearchView is initialized as it is lateinit property.*/
         if (searchView == null || searchView!!.isIconified) {
             restoreScrollPositionIfRequested()