diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
index 17e79d949..e0483cdbd 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchBar.java
@@ -177,6 +177,11 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
             }
         }
 
+        String[] keywords = mSearchDatabase.getSuggestions(text, 128);
+        for (String keyword : keywords) {
+            mSuggestionList.add(new KeywordSuggestion(keyword));
+        }
+
         EhTagDatabase ehTagDatabase = EhTagDatabase.getInstance(getContext());
         if (!TextUtils.isEmpty(text) && ehTagDatabase != null && !text.endsWith(" ")) {
             String[] s = text.split(" ");
@@ -191,11 +196,6 @@ public class SearchBar extends MaterialCardView implements View.OnClickListener,
             }
         }
 
-        String[] keywords = mSearchDatabase.getSuggestions(text, 128);
-        for (String keyword : keywords) {
-            mSuggestionList.add(new KeywordSuggestion(keyword));
-        }
-
         if (mSuggestionList.size() == 0) {
             removeListHeader();
         } else {