diff --git a/digimarks.py b/digimarks.py
index cfec245..b8173da 100644
--- a/digimarks.py
+++ b/digimarks.py
@@ -190,7 +190,8 @@ def bookmarks(userkey):
     #else:
     #    abort(404)
     bookmarks = Bookmark.select().where(Bookmark.userkey == userkey)
-    return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey)
+    tags = get_tags_for_user(userkey)
+    return render_template('bookmarks.html', bookmarks=bookmarks, userkey=userkey, tags=tags)
 
 
 
diff --git a/templates/bookmarks.html b/templates/bookmarks.html
index 891cc5a..596fd5d 100644
--- a/templates/bookmarks.html
+++ b/templates/bookmarks.html
@@ -2,6 +2,16 @@
 {% block title %}Bookmarks{% endblock %}
 {% block pageheader %}Bookmarks{% endblock %}
 {% block pagecontent %}
+{% if tags %}
+<div class="row">
+    {% for tag in tags %}
+    <div class="chip">
+        <a href="{{ url_for('tag', userkey=userkey, tag=tag) }}">{{ tag }}</a>
+    </div>
+    {% endfor %}
+</div>
+{% endif %}
+
 <div class="row">
     {% for bookmark in bookmarks %}
     <div class="col s12 m6 l4">