diff --git a/go/twitterchiver/viewer/templates/index.html b/go/twitterchiver/viewer/templates/index.html
index f23b9bb978..47f1dff292 100644
--- a/go/twitterchiver/viewer/templates/index.html
+++ b/go/twitterchiver/viewer/templates/index.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<title>Twitterchiver</title>
 <h1>Twitterchiver</h1>
 <h2>Accounts visible to {{.Username}}</h2>
 <ul>
diff --git a/go/twitterchiver/viewer/templates/tweets.html b/go/twitterchiver/viewer/templates/tweets.html
index 14605628ff..cc4e6d3357 100644
--- a/go/twitterchiver/viewer/templates/tweets.html
+++ b/go/twitterchiver/viewer/templates/tweets.html
@@ -1,4 +1,5 @@
 <!DOCTYPE html>
+<title>{{if .Query}}{{.Query}} - {{end}}@{{.TwitterUsername}} - Twitterchiver</title>
 <style>
 html, body {
 	background-color: rgb(21, 32, 43);
