diff --git a/core/templates/core/index.html b/core/templates/core/index.html
index cacb58a..ff88ab8 100644
--- a/core/templates/core/index.html
+++ b/core/templates/core/index.html
@@ -45,7 +45,12 @@
         <form method="get" class="mb-4">
             <div class="input-group input-group-lg shadow-sm">
                 <span class="input-group-text bg-white border-end-0"><i class="bi bi-search text-muted"></i></span>
-                <input type="text" name="q" class="form-control border-start-0 ps-0" placeholder="Search by title, url, notes or content..." value="{{ request.GET.q }}">
+                <input type="text" name="q" class="form-control border-start-0 ps-0 {% if request.GET.q %}border-end-0{% endif %}" placeholder="Search by title, url, notes or content..." value="{{ request.GET.q|default:'' }}">
+                {% if request.GET.q %}
+                    <a href="{% url 'home' %}{% if request.GET.tag %}?tag={{ request.GET.tag }}{% endif %}" class="input-group-text bg-white border-start-0 text-decoration-none" title="Clear search">
+                        <i class="bi bi-x-lg text-muted"></i>
+                    </a>
+                {% endif %}
                 {% if request.GET.tag %}
                     <input type="hidden" name="tag" value="{{ request.GET.tag }}">
                 {% endif %}