diff --git a/bookmarks/queries.py b/bookmarks/queries.py
index 3f659b3..5a29cce 100644
--- a/bookmarks/queries.py
+++ b/bookmarks/queries.py
@@ -29,17 +29,25 @@ def query_bookmarks(user: User, query_string: str):
     # Filter for user
     query_set = query_set.filter(owner=user)
 
-    # Split query into keywords
+    # Split query into search terms and tags
     keywords = query_string.strip().split(' ')
     keywords = [word for word in keywords if word]
 
-    # Filter for each keyword
-    for word in keywords:
+    search_terms = [word for word in keywords if word[0] != '#']
+    tag_names = [word[1:] for word in keywords if word[0] == '#']
+
+    # Filter for search terms and tags
+    for term in search_terms:
         query_set = query_set.filter(
-            Q(title__contains=word)
-            | Q(description__contains=word)
-            | Q(website_title__contains=word)
-            | Q(website_description__contains=word)
+            Q(title__contains=term)
+            | Q(description__contains=term)
+            | Q(website_title__contains=term)
+            | Q(website_description__contains=term)
+        )
+
+    for tag_name in tag_names:
+        query_set = query_set.filter(
+            tags__name=tag_name
         )
 
     # Sort by modification date
diff --git a/bookmarks/styles/bookmarks.scss b/bookmarks/styles/bookmarks.scss
index 3ea3055..7f3c456 100644
--- a/bookmarks/styles/bookmarks.scss
+++ b/bookmarks/styles/bookmarks.scss
@@ -1,3 +1,10 @@
+.bookmarks-page {
+
+  .search input[type=search] {
+    width: 200px;
+  }
+}
+
 ul.bookmark-list {
 
   list-style: none;
diff --git a/bookmarks/templates/bookmarks/index.html b/bookmarks/templates/bookmarks/index.html
index 86eabe8..29c2f09 100644
--- a/bookmarks/templates/bookmarks/index.html
+++ b/bookmarks/templates/bookmarks/index.html
@@ -3,7 +3,7 @@
 {% load bookmarks %}
 
 {% block content %}
-    <div class="columns">
+    <div class="bookmarks-page columns">
 
         {# Bookmark list #}
         <section class="content-area column col-8">
@@ -13,7 +13,7 @@
                 <div class="search">
                     <form action="{% url 'bookmarks:index' %}" method="get">
                         <div class="input-group">
-                            <input type="search" name="q" placeholder="Search..." value="{{ query }}">
+                            <input type="search" name="q" placeholder="Search for words or #tags" value="{{ query }}">
                             <input type="submit" value="Search" class="btn input-group-btn">
                         </div>
                     </form>
@@ -29,7 +29,7 @@
                             {% if bookmark.tag_names %}
                                 <span>
                                 {% for tag_name in bookmark.tag_names %}
-                                    <a href="?{% append_query_param q=tag_name %}">#{{ tag_name }}</a>
+                                    <a href="?{% append_query_param q=tag_name|hash_tag %}">{{ tag_name|hash_tag }}</a>
                                 {% endfor %}
                                 </span>
                             {% endif %}
diff --git a/bookmarks/templates/bookmarks/tag_cloud.html b/bookmarks/templates/bookmarks/tag_cloud.html
index 2b94af1..bf0d5be 100644
--- a/bookmarks/templates/bookmarks/tag_cloud.html
+++ b/bookmarks/templates/bookmarks/tag_cloud.html
@@ -5,7 +5,7 @@
         <p class="group">
             <span class="group-label mr-2">{{ group.char }}</span>
             {% for tag in group.tags %}
-                <a href="?{% append_query_param q=tag.name %}">
+                <a href="?{% append_query_param q=tag.name|hash_tag %}">
                     <span class="mr-2">{{ tag.name }}</span>
                 </a>
             {% endfor %}
diff --git a/bookmarks/templatetags/shared.py b/bookmarks/templatetags/shared.py
index b8e2b96..c5bc562 100644
--- a/bookmarks/templatetags/shared.py
+++ b/bookmarks/templatetags/shared.py
@@ -28,3 +28,8 @@ def append_query_param(context, **kwargs):
         query.__setitem__(key, value)
 
     return query.urlencode()
+
+
+@register.filter(name='hash_tag')
+def hash_tag(tag_name):
+    return '#' + tag_name