diff --git a/webview-ui/src/components/marketplace/components/MarketplaceItemCard.tsx b/webview-ui/src/components/marketplace/components/MarketplaceItemCard.tsx
index 3b8df52176..a9ea3c26ce 100644
--- a/webview-ui/src/components/marketplace/components/MarketplaceItemCard.tsx
+++ b/webview-ui/src/components/marketplace/components/MarketplaceItemCard.tsx
@@ -172,7 +172,7 @@ export const MarketplaceItemCard: React.FC<MarketplaceItemCardProps> = ({ item,
 									key={tag}
 									content={
 										filters.tags.includes(tag)
-											? t("marketplace:filters.tags.clear", { count: tag })
+											? t("marketplace:filters.tags.removeFromFilter", { tag })
 											: t("marketplace:filters.tags.clickToFilter")
 									}>
 									<Button
diff --git a/webview-ui/src/components/marketplace/components/__tests__/MarketplaceItemCard.spec.tsx b/webview-ui/src/components/marketplace/components/__tests__/MarketplaceItemCard.spec.tsx
index 4fdc685192..cde00cc632 100644
--- a/webview-ui/src/components/marketplace/components/__tests__/MarketplaceItemCard.spec.tsx
+++ b/webview-ui/src/components/marketplace/components/__tests__/MarketplaceItemCard.spec.tsx
@@ -1,4 +1,4 @@
-import { render, screen } from "@/utils/test-utils"
+import { render, screen, waitFor } from "@/utils/test-utils"
 import userEvent from "@testing-library/user-event"
 
 import { MarketplaceItem } from "@roo-code/types"
@@ -27,10 +27,12 @@ vi.mock("@/i18n/TranslationContext", () => ({
 			if (key === "marketplace:items.card.by") {
 				return `by ${params.author}`
 			}
+			if (key === "marketplace:filters.tags.removeFromFilter") {
+				return `Remove ${params.tag} from filters`
+			}
 			const translations: Record<string, any> = {
 				"marketplace:filters.type.mode": "Mode",
 				"marketplace:filters.type.mcpServer": "MCP Server",
-				"marketplace:filters.tags.clear": "Remove filter",
 				"marketplace:filters.tags.clickToFilter": "Add filter",
 				"marketplace:items.components": "Components", // This should be a string for the title prop
 				"marketplace:items.card.install": "Install",
@@ -118,6 +120,22 @@ describe("MarketplaceItemCard", () => {
 		expect(setFilters).toHaveBeenCalledWith({ tags: ["test"] })
 	})
 
+	it.each([
+		{ selectedTags: [], tooltip: "Add filter" },
+		{ selectedTags: ["test"], tooltip: "Remove test from filters" },
+	])("shows '$tooltip' on hover when selected tags are $selectedTags", async ({ selectedTags, tooltip }) => {
+		const user = userEvent.setup()
+		renderWithProviders(
+			<MarketplaceItemCard {...defaultProps} filters={{ ...defaultProps.filters, tags: selectedTags }} />,
+		)
+
+		await user.hover(screen.getByText("test"))
+
+		await waitFor(() => expect(screen.getByRole("tooltip", { name: tooltip })).toBeInTheDocument(), {
+			timeout: 1000,
+		})
+	})
+
 	it("handles author link click", async () => {
 		const user = userEvent.setup()
 		renderWithProviders(<MarketplaceItemCard {...defaultProps} />)
diff --git a/webview-ui/src/i18n/locales/ca/marketplace.json b/webview-ui/src/i18n/locales/ca/marketplace.json
index eaf4fbcd00..f6d7029947 100644
--- a/webview-ui/src/i18n/locales/ca/marketplace.json
+++ b/webview-ui/src/i18n/locales/ca/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Filtrar per etiquetes:",
 			"clear": "Netejar etiquetes",
+			"removeFromFilter": "Fes clic per treure '{{tag}}' dels filtres",
 			"placeholder": "Escriu per cercar i seleccionar etiquetes...",
 			"noResults": "No s'han trobat etiquetes coincidents",
 			"selected": "Mostrant elements amb qualsevol de les etiquetes seleccionades",
diff --git a/webview-ui/src/i18n/locales/de/marketplace.json b/webview-ui/src/i18n/locales/de/marketplace.json
index 45e25ef11f..1ca89f0f84 100644
--- a/webview-ui/src/i18n/locales/de/marketplace.json
+++ b/webview-ui/src/i18n/locales/de/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Nach Tags filtern:",
 			"clear": "Tags löschen",
+			"removeFromFilter": "Klicke, um '{{tag}}' aus den Filtern zu entfernen",
 			"placeholder": "Zum Suchen und Auswählen von Tags eingeben...",
 			"noResults": "Keine passenden Tags gefunden",
 			"selected": "Zeige Elemente mit einem der ausgewählten Tags",
diff --git a/webview-ui/src/i18n/locales/en/marketplace.json b/webview-ui/src/i18n/locales/en/marketplace.json
index deadd10e3d..3a0c88e984 100644
--- a/webview-ui/src/i18n/locales/en/marketplace.json
+++ b/webview-ui/src/i18n/locales/en/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Filter by tags:",
 			"clear": "Clear tags",
+			"removeFromFilter": "Click to remove '{{tag}}' from filters",
 			"placeholder": "Type to search and select tags...",
 			"noResults": "No matching tags found",
 			"selected": "Showing items with any of the selected tags",
diff --git a/webview-ui/src/i18n/locales/es/marketplace.json b/webview-ui/src/i18n/locales/es/marketplace.json
index 24acb95e87..e53ae855f9 100644
--- a/webview-ui/src/i18n/locales/es/marketplace.json
+++ b/webview-ui/src/i18n/locales/es/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Filtrar por etiquetas:",
 			"clear": "Limpiar etiquetas",
+			"removeFromFilter": "Haz clic para quitar '{{tag}}' de los filtros",
 			"placeholder": "Escribe para buscar y seleccionar etiquetas...",
 			"noResults": "No se encontraron etiquetas coincidentes",
 			"selected": "Mostrando elementos con cualquiera de las etiquetas seleccionadas",
diff --git a/webview-ui/src/i18n/locales/fr/marketplace.json b/webview-ui/src/i18n/locales/fr/marketplace.json
index ef47d555b6..124b5a01f8 100644
--- a/webview-ui/src/i18n/locales/fr/marketplace.json
+++ b/webview-ui/src/i18n/locales/fr/marketplace.json
@@ -17,7 +17,8 @@
 		},
 		"tags": {
 			"label": "Filtrer par étiquettes :",
-			"clear": "Cliquez pour supprimer '{{count}}' des filtres",
+			"clear": "Effacer les étiquettes",
+			"removeFromFilter": "Clique pour retirer '{{tag}}' des filtres",
 			"placeholder": "Tapez pour rechercher et sélectionner des étiquettes...",
 			"noResults": "Aucune étiquette correspondante trouvée",
 			"selected": "Affichage des éléments avec l'une des étiquettes sélectionnées",
diff --git a/webview-ui/src/i18n/locales/hi/marketplace.json b/webview-ui/src/i18n/locales/hi/marketplace.json
index 46e85f0351..dc01d891de 100644
--- a/webview-ui/src/i18n/locales/hi/marketplace.json
+++ b/webview-ui/src/i18n/locales/hi/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "टैग के अनुसार फ़िल्टर करें:",
 			"clear": "टैग साफ़ करें",
+			"removeFromFilter": "फ़िल्टर से '{{tag}}' हटाने के लिए क्लिक करें",
 			"placeholder": "टैग खोजने और चुनने के लिए टाइप करें...",
 			"noResults": "कोई मिलान टैग नहीं मिला",
 			"selected": "चयनित टैग में से किसी एक के साथ आइटम दिखाएं",
diff --git a/webview-ui/src/i18n/locales/id/marketplace.json b/webview-ui/src/i18n/locales/id/marketplace.json
index 11e8b9e937..e1a5c2abb5 100644
--- a/webview-ui/src/i18n/locales/id/marketplace.json
+++ b/webview-ui/src/i18n/locales/id/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Filter berdasarkan tag:",
 			"clear": "Hapus tag",
+			"removeFromFilter": "Klik untuk menghapus '{{tag}}' dari filter",
 			"placeholder": "Ketik untuk mencari dan memilih tag...",
 			"noResults": "Tidak ada tag yang cocok",
 			"selected": "Menampilkan item dengan tag yang dipilih",
diff --git a/webview-ui/src/i18n/locales/it/marketplace.json b/webview-ui/src/i18n/locales/it/marketplace.json
index ca86d5ee04..6d2f67e74d 100644
--- a/webview-ui/src/i18n/locales/it/marketplace.json
+++ b/webview-ui/src/i18n/locales/it/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Filtra per tag:",
 			"clear": "Cancella tag",
+			"removeFromFilter": "Clicca per rimuovere '{{tag}}' dai filtri",
 			"placeholder": "Digita per cercare e selezionare tag...",
 			"noResults": "Nessun tag corrispondente trovato",
 			"selected": "Mostra elementi con uno qualsiasi dei tag selezionati",
diff --git a/webview-ui/src/i18n/locales/ja/marketplace.json b/webview-ui/src/i18n/locales/ja/marketplace.json
index b6d7e20ff1..56b43a3e8b 100644
--- a/webview-ui/src/i18n/locales/ja/marketplace.json
+++ b/webview-ui/src/i18n/locales/ja/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "タグでフィルター:",
 			"clear": "タグをクリア",
+			"removeFromFilter": "クリックしてフィルターから「{{tag}}」を削除",
 			"placeholder": "タグを検索して選択するために入力...",
 			"noResults": "一致するタグが見つかりません",
 			"selected": "選択されたタグのいずれかを持つアイテムを表示",
diff --git a/webview-ui/src/i18n/locales/ko/marketplace.json b/webview-ui/src/i18n/locales/ko/marketplace.json
index 15b9a31ea7..957e624a25 100644
--- a/webview-ui/src/i18n/locales/ko/marketplace.json
+++ b/webview-ui/src/i18n/locales/ko/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "태그별 필터:",
 			"clear": "태그 지우기",
+			"removeFromFilter": "클릭하여 필터에서 '{{tag}}' 제거",
 			"placeholder": "태그를 검색하고 선택하려면 입력하세요...",
 			"noResults": "일치하는 태그가 없습니다",
 			"selected": "선택된 태그 중 하나를 가진 아이템 표시",
diff --git a/webview-ui/src/i18n/locales/nl/marketplace.json b/webview-ui/src/i18n/locales/nl/marketplace.json
index 866f3ca581..07678a0cae 100644
--- a/webview-ui/src/i18n/locales/nl/marketplace.json
+++ b/webview-ui/src/i18n/locales/nl/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Filteren op tags:",
 			"clear": "Tags wissen",
+			"removeFromFilter": "Klik om '{{tag}}' uit de filters te verwijderen",
 			"placeholder": "Type om tags te zoeken en selecteren...",
 			"noResults": "Geen overeenkomende tags gevonden",
 			"selected": "Items tonen met een van de geselecteerde tags",
diff --git a/webview-ui/src/i18n/locales/pl/marketplace.json b/webview-ui/src/i18n/locales/pl/marketplace.json
index eef805fa87..3a4f3fb12e 100644
--- a/webview-ui/src/i18n/locales/pl/marketplace.json
+++ b/webview-ui/src/i18n/locales/pl/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Filtruj według tagów:",
 			"clear": "Wyczyść tagi",
+			"removeFromFilter": "Kliknij, aby usunąć '{{tag}}' z filtrów",
 			"placeholder": "Wpisz, aby wyszukać i wybrać tagi...",
 			"noResults": "Nie znaleziono pasujących tagów",
 			"selected": "Pokazywanie elementów z dowolnym z wybranych tagów",
diff --git a/webview-ui/src/i18n/locales/pt-BR/marketplace.json b/webview-ui/src/i18n/locales/pt-BR/marketplace.json
index 7dc6c7f34e..9931ba514f 100644
--- a/webview-ui/src/i18n/locales/pt-BR/marketplace.json
+++ b/webview-ui/src/i18n/locales/pt-BR/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Filtrar por tags:",
 			"clear": "Limpar tags",
+			"removeFromFilter": "Clique para remover '{{tag}}' dos filtros",
 			"placeholder": "Digite para buscar e selecionar tags...",
 			"noResults": "Nenhuma tag correspondente encontrada",
 			"selected": "Mostrando itens com qualquer uma das tags selecionadas",
diff --git a/webview-ui/src/i18n/locales/ru/marketplace.json b/webview-ui/src/i18n/locales/ru/marketplace.json
index 40664baf49..f09e26c782 100644
--- a/webview-ui/src/i18n/locales/ru/marketplace.json
+++ b/webview-ui/src/i18n/locales/ru/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Фильтр по тегам:",
 			"clear": "Очистить теги",
+			"removeFromFilter": "Нажми, чтобы убрать '{{tag}}' из фильтров",
 			"placeholder": "Введите для поиска и выбора тегов...",
 			"noResults": "Подходящие теги не найдены",
 			"selected": "Показаны элементы с любым из выбранных тегов",
diff --git a/webview-ui/src/i18n/locales/tr/marketplace.json b/webview-ui/src/i18n/locales/tr/marketplace.json
index 54c3965dde..32c7534dd7 100644
--- a/webview-ui/src/i18n/locales/tr/marketplace.json
+++ b/webview-ui/src/i18n/locales/tr/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Etiketlere göre filtrele:",
 			"clear": "Etiketleri temizle",
+			"removeFromFilter": "'{{tag}}' etiketini filtrelerden kaldırmak için tıkla",
 			"placeholder": "Etiket aramak ve seçmek için yazın...",
 			"noResults": "Eşleşen etiket bulunamadı",
 			"selected": "Seçilen etiketlerden herhangi birine sahip öğeler gösteriliyor",
diff --git a/webview-ui/src/i18n/locales/vi/marketplace.json b/webview-ui/src/i18n/locales/vi/marketplace.json
index d752bdd877..5c15450059 100644
--- a/webview-ui/src/i18n/locales/vi/marketplace.json
+++ b/webview-ui/src/i18n/locales/vi/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "Lọc theo thẻ:",
 			"clear": "Xóa thẻ",
+			"removeFromFilter": "Nhấp để xóa '{{tag}}' khỏi bộ lọc",
 			"placeholder": "Nhập để tìm kiếm và chọn thẻ...",
 			"noResults": "Không tìm thấy thẻ phù hợp",
 			"selected": "Hiển thị các mục có bất kỳ thẻ nào được chọn",
diff --git a/webview-ui/src/i18n/locales/zh-CN/marketplace.json b/webview-ui/src/i18n/locales/zh-CN/marketplace.json
index 2e83e9ae89..2af998592d 100644
--- a/webview-ui/src/i18n/locales/zh-CN/marketplace.json
+++ b/webview-ui/src/i18n/locales/zh-CN/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "按标签筛选：",
 			"clear": "清除标签",
+			"removeFromFilter": "点击从筛选条件中移除'{{tag}}'",
 			"placeholder": "输入搜索和选择标签...",
 			"noResults": "未找到匹配的标签",
 			"selected": "显示包含任何选定标签的项目",
diff --git a/webview-ui/src/i18n/locales/zh-TW/marketplace.json b/webview-ui/src/i18n/locales/zh-TW/marketplace.json
index 1b50e38c56..a5c0a2e90d 100644
--- a/webview-ui/src/i18n/locales/zh-TW/marketplace.json
+++ b/webview-ui/src/i18n/locales/zh-TW/marketplace.json
@@ -18,6 +18,7 @@
 		"tags": {
 			"label": "依標籤篩選：",
 			"clear": "清除標籤",
+			"removeFromFilter": "點選以從篩選條件中移除「{{tag}}」",
 			"placeholder": "輸入以搜尋並選擇標籤...",
 			"noResults": "找不到符合的標籤",
 			"selected": "顯示包含任何已選標籤的項目",