diff --git a/source/popup/components/pages/EntriesPage.tsx b/source/popup/components/pages/EntriesPage.tsx
index c4f0defb..fc9c95fc 100644
--- a/source/popup/components/pages/EntriesPage.tsx
+++ b/source/popup/components/pages/EntriesPage.tsx
@@ -145,12 +145,6 @@ function EntriesPageList(props: EntriesPageProps) {
                     description={t("popup.all-locked.description")}
                     icon="folder-close"
                 />
-            ) || (urlEntries.length <= 0 && recentEntries.length <= 0) && (
-                <InvalidState
-                    title={t("popup.no-entries.title")}
-                    description={t("popup.no-entries.description")}
-                    icon="clean"
-                />
             ) || searchedEntries.length > 0 && (
                 <EntryItemList
                     entries={searchedEntries}
@@ -158,6 +152,12 @@ function EntriesPageList(props: EntriesPageProps) {
                     onEntryClick={handleEntryBodyClick}
                     onEntryInfoClick={handleEntryInfoClick}
                 />
+            ) || (urlEntries.length <= 0 && recentEntries.length <= 0) && (
+                <InvalidState
+                    title={t("popup.no-entries.title")}
+                    description={t("popup.no-entries.description")}
+                    icon="clean"
+                />
             ) || (
                 <EntryItemList
                     entries={{