diff --git a/model/token.go b/model/token.go
index 9121ca46..41746d9a 100644
--- a/model/token.go
+++ b/model/token.go
@@ -33,7 +33,7 @@ func SearchUserTokens(userId int, keyword string, token string) (tokens []*Token
 	if token != "" {
 		token = strings.Trim(token, "sk-")
 	}
-	err = DB.Where("user_id = ?", userId).Where("name LIKE ? or key LIKE ?", keyword+"%", token+"%").Find(&tokens).Error
+	err = DB.Where("user_id = ?", userId).Where("name LIKE ?", keyword+"%").Where("key LIKE ?", token+"%").Find(&tokens).Error
 	return tokens, err
 }
 
diff --git a/web/src/components/TokensTable.js b/web/src/components/TokensTable.js
index b04fb84b..d44e6065 100644
--- a/web/src/components/TokensTable.js
+++ b/web/src/components/TokensTable.js
@@ -377,14 +377,14 @@ const TokensTable = () => {
     };
 
     const searchTokens = async () => {
-        if (searchKeyword === '') {
+        if (searchKeyword === '' && searchToken === '') {
             // if keyword is blank, load files instead.
             await loadTokens(0);
             setActivePage(1);
             return;
         }
         setSearching(true);
-        const res = await API.get(`/api/token/search?keyword=${searchKeyword}`);
+        const res = await API.get(`/api/token/search?keyword=${searchKeyword}&token=${searchToken}`);
         const {success, message, data} = res.data;
         if (success) {
             setTokensFormat(data);