diff --git a/frontend/src/components/admin_next/tags/AdminTagsList.vue b/frontend/src/components/admin_next/tags/AdminTagsList.vue
index 0bbf77895..b113f46e6 100644
--- a/frontend/src/components/admin_next/tags/AdminTagsList.vue
+++ b/frontend/src/components/admin_next/tags/AdminTagsList.vue
@@ -236,11 +236,23 @@
 
   const fetchtags = async (current) => {
     loading.value = true
+
+    const params = new URLSearchParams({
+      page: current || page.value,
+      per: per.value
+    });
+
+    if (keyword.value) {
+      params.append('category', keyword.value);
+    }
+    if (scope.value) {
+      params.append('scope', scope.value);
+    }
+
     const { data, error } = await useFetchApi(
-      `/tags?page=${current || page.value}&per=${per.value}&category=${
-        keyword.value
-      }&scope=${scope.value || ''}`
+      `/tags?${params.toString()}`
     ).json()
+
     if (data.value) {
       tags.value = data.value.data
       total.value = data.value.data?.length || 0
@@ -250,6 +262,7 @@
     page.value = 1
     loading.value = false
   }
+
   const deleteTag = async (tag) => {
     const { data, error } = await useFetchApi(`/tags/${tag.id}`, {
       method: 'DELETE'
diff --git a/frontend/src/components/tags/TagSidebar.vue b/frontend/src/components/tags/TagSidebar.vue
index a08fcd39e..f0cf8da21 100644
--- a/frontend/src/components/tags/TagSidebar.vue
+++ b/frontend/src/components/tags/TagSidebar.vue
@@ -20,7 +20,7 @@
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup>
   import { ref, onMounted, computed, watch } from 'vue'
   import TagList from './TagList.vue'
   import useFetchApi from '../../packs/useFetchApi'
@@ -115,7 +115,14 @@
   }
 
   async function fetchTags() {
-    const { error, data } = await useFetchApi(`/tags`).json()
+    const params = new URLSearchParams({
+      scope: props.repoType,
+      built_in: true
+    })
+    avaliableCategories.value.forEach((category) => {
+      params.append('category', category.name)
+    })
+    const { error, data } = await useFetchApi(`/tags?${params.toString()}`).json()
     if (!data.value) {
       ElMessage({
         message: error.value.msg || t('all.fetchError'),