diff --git a/expenses_manager/expenses/static/expenses/css/base.css b/expenses_manager/expenses/static/expenses/css/base.css
index c847f94..cd94a86 100644
--- a/expenses_manager/expenses/static/expenses/css/base.css
+++ b/expenses_manager/expenses/static/expenses/css/base.css
@@ -18,4 +18,19 @@
 .card-chart canvas {
     width: 100% !important;
     height: 220px !important;
+}
+
+.tag{
+    display: inline-block;
+    padding: 2px 6px;
+    margin-right: 4px;
+    background: #eef2f7;
+    border-radius: 4px;
+    font-size: 0.85rem;
+    text-decoration: none;
+    color: #333;
+}
+
+.tag:hover {
+    background: #dbe3ee;
 }
\ No newline at end of file
diff --git a/expenses_manager/expenses/templates/expenses/expense_list.html b/expenses_manager/expenses/templates/expenses/expense_list.html
index c74bb3d..4eae62c 100644
--- a/expenses_manager/expenses/templates/expenses/expense_list.html
+++ b/expenses_manager/expenses/templates/expenses/expense_list.html
@@ -1,7 +1,9 @@
+{% load static %}
 <!DOCTYPE html>
 <html>
     <head>
-        <title>Gastos</title>        
+        <title>Gastos</title>
+        <link rel="stylesheet" href="{% static 'expenses/css/base.css' %}">
     </head>
     <body>
         <h1>Mis gastos</h1>
@@ -43,6 +45,18 @@
                 </select>
             </label>
 
+            <label for="tag">Filtrar por tag:</label>
+            <select name="tag" id="tag" onchange="this.form.submit()">
+                <option value="">Todas</option>
+                {% for tag in tags %}
+                    <option value="{{ tag.id }}"
+                        {% if selected_tag == tag.id %}selected{% endif %}
+                    >
+                        {{ tag.name }}
+                    </option>
+                {% endfor %}
+            </select>
+
             <button type="submit">Filtrar</button>
             <a href="{% url 'expense_list' %}">Limpiar</a>
         </form>
@@ -77,7 +91,8 @@
                         <td>{{ expense.amount }}</td>
                         <td>
                             {% for tag in expense.tags.all %}
-                                <span>{{ tag.name }}</span>{% if not forloop.last %}, {% endif %}
+                                <!-- <span>{{ tag.name }}</span>{% if not forloop.last %}, {% endif %} -->
+                                <a href="?tag={{ tag.id }}" class="tag">{{ tag.name }}</a>
                             {% empty %}
                                 -
                             {% endfor %}
@@ -98,15 +113,15 @@
         <div class="pagination">
             <span class="step-links">
                 {% if page_obj.has_previous %}
-                    <a href="?page=1{% if selected_year %}&year={{ selected_year }}{% endif %}{% if selected_month %}&month={{ selected_month }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">&laquo; Primero</a>
-                    <a href="?page={{ page_obj.previous_page_number }}{% if selected_year %}&year={{ selected_year }}{% endif %}{% if selected_month %}&month={{ selected_month }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">Anterior</a>
+                    <a href="?page=1{% if selected_year %}&year={{ selected_year }}{% endif %}{% if selected_month %}&month={{ selected_month }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}{% if selected_tag %}&tag={{ selected_tag }}{% endif %}">&laquo; Primero</a>
+                    <a href="?page={{ page_obj.previous_page_number }}{% if selected_year %}&year={{ selected_year }}{% endif %}{% if selected_month %}&month={{ selected_month }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}{% if selected_tag %}&tag={{ selected_tag }}{% endif %}">Anterior</a>
                 {% endif %}
 
                 <span>Página {{ page_obj.number }} de {{ page_obj.paginator.num_pages }}</span>
 
                 {% if page_obj.has_next %}
-                    <a href="?page={{ page_obj.next_page_number }}{% if selected_year %}&year={{ selected_year }}{% endif %}{% if selected_month %}&month={{ selected_month }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">Siguiente</a>
-                    <a href="?page={{ page_obj.paginator.num_pages }}{% if selected_year %}&year={{ selected_year }}{% endif %}{% if selected_month %}&month={{ selected_month }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}">Último &raquo;</a>
+                    <a href="?page={{ page_obj.next_page_number }}{% if selected_year %}&year={{ selected_year }}{% endif %}{% if selected_month %}&month={{ selected_month }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}{% if selected_tag %}&tag={{ selected_tag }}{% endif %}">Siguiente</a>
+                    <a href="?page={{ page_obj.paginator.num_pages }}{% if selected_year %}&year={{ selected_year }}{% endif %}{% if selected_month %}&month={{ selected_month }}{% endif %}{% if selected_category %}&category={{ selected_category }}{% endif %}{% if selected_tag %}&tag={{ selected_tag }}{% endif %}">Último &raquo;</a>
                 {% endif %}
             </span>
         </div>
diff --git a/expenses_manager/expenses/views.py b/expenses_manager/expenses/views.py
index a276f76..373cdb0 100644
--- a/expenses_manager/expenses/views.py
+++ b/expenses_manager/expenses/views.py
@@ -102,7 +102,7 @@ def expense_list(request):
     expenses = Expense.objects.filter(owner=request.user)
     
     categories = Category.objects.filter(owner=request.user)
-    
+
     year_list = (
         Expense.objects.filter(owner=request.user)
         .dates('date', 'year')
@@ -114,6 +114,7 @@ def expense_list(request):
     year = _get_int(request.GET.get('year'))
     month = _get_int(request.GET.get('month'))
     category = _get_int(request.GET.get('category'))
+    tag_id = _get_int(request.GET.get('tag'))
     
     if year:
         expenses = expenses.filter(date__year=year)
@@ -124,6 +125,9 @@ def expense_list(request):
     if category:
         expenses = expenses.filter(category_id=category)
     
+    if tag_id:
+        expenses = expenses.filter(tags__id=tag_id)
+    
     expenses = expenses.order_by('-date')
     
     total_amount = expenses.aggregate(
@@ -158,6 +162,8 @@ def expense_list(request):
             'kpi_total': total_amount,
             'kpi_count': expense_count,
             'kpi_categories': category_count,
+            'selected_tag': tag_id,
+            'tags': Tag.objects.filter(owner=request.user),
         },
     )
 
