diff --git a/service/service.go b/service/service.go
index 4343928..c284597 100644
--- a/service/service.go
+++ b/service/service.go
@@ -162,9 +162,11 @@ func (s *service) TimelinePage(c *client, tType, instance, listId, maxID,
 		}
 		title = "The Whole Known Network"
 	case "tag":
-		statuses, err = c.GetTimelineHashtag(c.ctx, tag, false, &pg)
-		if err != nil {
-			return err
+		if len(tag) > 0 {
+			statuses, err = c.GetTimelineHashtag(c.ctx, tag, false, &pg)
+			if err != nil {
+				return err
+			}
 		}
 		title = "Tag timeline"
 
@@ -203,6 +205,9 @@ func (s *service) TimelinePage(c *client, tType, instance, listId, maxID,
 		if len(instance) > 0 {
 			v.Set("instance", instance)
 		}
+		if len(tag) > 0 {
+			v.Set("tag", tag)
+		}
 		if len(listId) > 0 {
 			v.Set("list", listId)
 		}
@@ -215,6 +220,9 @@ func (s *service) TimelinePage(c *client, tType, instance, listId, maxID,
 		if len(instance) > 0 {
 			v.Set("instance", instance)
 		}
+		if len(tag) > 0 {
+			v.Set("tag", tag)
+		}
 		if len(listId) > 0 {
 			v.Set("list", listId)
 		}
diff --git a/templates/nav.tmpl b/templates/nav.tmpl
index e1e120f..492359a 100644
--- a/templates/nav.tmpl
+++ b/templates/nav.tmpl
@@ -22,6 +22,7 @@
 			<a class="nav-link" href="/search" accesskey="6" title="Search (6)">search</a>
 		</div>
 		<div>
+			<a class="nav-link" href="/timeline/tag">tag</a>
 			<a class="nav-link" href="/lists" accesskey="7" title="Lists (7)">lists</a>
 			<a class="nav-link" href="/settings" target="_top" accesskey="8" title="Settings (8)">settings</a>
 			<form class="signout" action="/signout" method="post" target="_top">
diff --git a/templates/timeline.tmpl b/templates/timeline.tmpl
index 38659dc..1145b7a 100644
--- a/templates/timeline.tmpl
+++ b/templates/timeline.tmpl
@@ -14,6 +14,16 @@
 	<button type="submit"> Submit </button>
 </form>
 {{end}}
+{{if eq .Type "tag"}}
+<form class="search-form" action="/timeline/tag" method="GET">
+	<span class="post-form-field">
+		<label for="tag"> Tag </label>
+		<input id="tag" name="tag" value="">
+	</span>
+	<button type="submit"> Submit </button>
+</form>
+{{end}}
+
 
 {{range .Statuses}}
 {{template "status.tmpl" (WithContext . $.Ctx)}}