diff --git a/brutaldon/templates/main/timeline.html b/brutaldon/templates/main/timeline.html
index 978325a..1a4005d 100644
--- a/brutaldon/templates/main/timeline.html
+++ b/brutaldon/templates/main/timeline.html
@@ -6,12 +6,13 @@
 {% endblock %}
 
 {% block content %}
+{% if form %}
     <h1 class="title">Post</h1>
     <div class="box">
         {% include "main/post_partial.html" %}
     </div>
     <hr class="is-hidden">
-
+{% endif %}
     <h1 class="title">Your {{ timeline }} timeline</h1>
     {% for toot in toots %}
     <div class="box">
diff --git a/brutaldon/urls.py b/brutaldon/urls.py
index 41f73dd..34770fe 100644
--- a/brutaldon/urls.py
+++ b/brutaldon/urls.py
@@ -28,6 +28,7 @@ urlpatterns = [
     path('fed', views.fed, name='fed'),
     path('settings', views.settings, name='settings'),
     path('thread/<int:id>', views.thread, name='thread'),
+    path('tags/<tag>', views.tag, name='tag'),
     path('toot', views.toot, name="toot"),
     path('reply/<int:id>', views.reply, name='reply'),
     path('fav/<int:id>', views.fav, name='fav'),
diff --git a/brutaldon/views.py b/brutaldon/views.py
index 8f5d40f..c47bbc0 100644
--- a/brutaldon/views.py
+++ b/brutaldon/views.py
@@ -60,6 +60,18 @@ def local(request):
 def fed(request):
     return timeline(request, 'public', 'Federated')
 
+@never_cache
+def tag(request, tag):
+    try:
+        mastodon = get_mastodon(request)
+    except NotLoggedInException:
+        return redirect(login)
+    data = mastodon.timeline_hashtag(tag)
+    return render(request, 'main/timeline.html',
+                  {'toots': data, 'timeline': '#'+tag,
+                   'fullbrutalism': fullbrutalism_p(request)})
+
+
 def login(request):
     if request.method == "GET":
         form = LoginForm()