diff --git a/frontend/src/views/app-store/apps/index.vue b/frontend/src/views/app-store/apps/index.vue
index 7e6465e8c407..001b6509f7d0 100644
--- a/frontend/src/views/app-store/apps/index.vue
+++ b/frontend/src/views/app-store/apps/index.vue
@@ -258,13 +258,13 @@ onMounted(async () => {
     padding-bottom: 10px;
 }
 
-.tag-button {
-    margin-right: 10px;
-    &.no-active {
-        background: none;
-        border: none;
-    }
-}
+// .tag-button {
+//     margin-right: 10px;
+//     &.no-active {
+//         background: none;
+//         border: none;
+//     }
+// }
 
 @media only screen and (min-width: 768px) and (max-width: 1200px) {
     .app-col-12 {
diff --git a/frontend/src/views/app-store/components/tag.vue b/frontend/src/views/app-store/components/tag.vue
index 93ab6fab0630..9bbce6041813 100644
--- a/frontend/src/views/app-store/components/tag.vue
+++ b/frontend/src/views/app-store/components/tag.vue
@@ -1,26 +1,17 @@
 <template>
-    <div>
-        <el-button
-            class="tag-button"
-            :class="activeTag === 'all' ? '' : 'no-active'"
-            @click="changeTag('all')"
-            :type="activeTag === 'all' ? 'primary' : ''"
-            :plain="activeTag !== 'all'"
-        >
+    <div ref="containerRef" class="flex gap-2">
+        <el-check-tag :checked="activeTag == 'all'" @click="changeTag('all')">
             {{ $t('app.all') }}
-        </el-button>
-        <div v-for="item in tags.slice(0, 7)" :key="item.key" class="inline">
-            <el-button
-                class="tag-button"
-                :class="activeTag === item.key ? '' : 'no-active'"
-                @click="changeTag(item.key)"
-                :type="activeTag === item.key ? 'primary' : ''"
-                :plain="activeTag !== item.key"
-            >
-                {{ item.name }}
-            </el-button>
-        </div>
-        <div class="inline">
+        </el-check-tag>
+        <el-check-tag
+            :checked="activeTag == item.key"
+            v-for="item in visibleTags"
+            :key="item.key"
+            @click="changeTag(item.key)"
+        >
+            {{ item.name }}
+        </el-check-tag>
+        <div class="inline" v-if="hiddenTags.length > 0">
             <el-dropdown>
                 <el-button
                     class="tag-button"
@@ -34,7 +25,7 @@
                 </el-button>
                 <template #dropdown>
                     <el-dropdown-menu>
-                        <el-dropdown-item v-for="item in tags.slice(7)" @click="changeTag(item.key)" :key="item.key">
+                        <el-dropdown-item v-for="item in hiddenTags" @click="changeTag(item.key)" :key="item.key">
                             {{ item.name }}
                         </el-dropdown-item>
                     </el-dropdown-menu>
@@ -55,11 +46,16 @@ const props = defineProps({
     },
 });
 
+const containerRef = ref<HTMLElement>();
 const activeTag = ref('all');
 const tags = ref<App.Tag[]>([]);
 const moreTag = ref('');
+const visibleTagCount = ref(7);
 const emit = defineEmits(['change']);
 
+const visibleTags = computed(() => tags.value.slice(0, visibleTagCount.value));
+const hiddenTags = computed(() => tags.value.slice(visibleTagCount.value));
+
 const getTagValue = (key: string) => {
     const tag = tags.value.find((tag) => tag.key === key);
     if (tag) {
@@ -71,13 +67,47 @@ const changeTag = (key: string) => {
     activeTag.value = key;
     emit('change', key);
     const index = tags.value.findIndex((tag) => tag.key === key);
-    if (index > 6) {
+    if (index >= visibleTagCount.value) {
         moreTag.value = key;
     } else {
         moreTag.value = '';
     }
 };
 
+const calculateVisibleTagCount = () => {
+    if (!containerRef.value) return;
+
+    const containerWidth = containerRef.value.offsetWidth;
+
+    if (containerWidth >= 1800) {
+        visibleTagCount.value = 18;
+    } else if (containerWidth >= 1400) {
+        visibleTagCount.value = 15;
+    } else if (containerWidth >= 1200) {
+        visibleTagCount.value = 12;
+    } else if (containerWidth >= 992) {
+        visibleTagCount.value = 8;
+    } else if (containerWidth >= 768) {
+        visibleTagCount.value = 6;
+    } else if (containerWidth >= 576) {
+        visibleTagCount.value = 4;
+    } else {
+        visibleTagCount.value = 2;
+    }
+};
+
+let resizeObserver: ResizeObserver | null = null;
+
+const initResizeObserver = () => {
+    if (!containerRef.value) return;
+
+    resizeObserver = new ResizeObserver(() => {
+        calculateVisibleTagCount();
+    });
+
+    resizeObserver.observe(containerRef.value);
+};
+
 const getTags = async () => {
     await getAppTags().then((res) => {
         for (let i = 0; i < res.data.length; i++) {
@@ -87,10 +117,28 @@ const getTags = async () => {
             }
         }
         tags.value = res.data;
+        nextTick(() => {
+            calculateVisibleTagCount();
+        });
     });
 };
 
 onMounted(() => {
     getTags();
+    nextTick(() => {
+        initResizeObserver();
+    });
+});
+
+onBeforeUnmount(() => {
+    if (resizeObserver) {
+        resizeObserver.disconnect();
+    }
 });
 </script>
+
+<style lang="scss" scoped>
+.el-check-tag.el-check-tag--primary.is-checked {
+    background-color: var(--el-color-info-light-9) !important;
+}
+</style>