diff --git a/internal/webserver/server_test.go b/internal/webserver/server_test.go
index b9295d4..1912a41 100644
--- a/internal/webserver/server_test.go
+++ b/internal/webserver/server_test.go
@@ -266,13 +266,16 @@ func TestSearch(t *testing.T) {
 	assert := assert.New(t)
 	require := require.New(t)
 
-	resp := do_request(httptest.NewRequest("GET", fmt.Sprintf("/search/%s", url.PathEscape("to:spacex to:covfefeanon")), nil))
+	search_txt := "to:spacex to:covfefeanon"
+
+	resp := do_request(httptest.NewRequest("GET", fmt.Sprintf("/search/%s", url.PathEscape(search_txt)), nil))
 	require.Equal(resp.StatusCode, 200)
 
 	root, err := html.Parse(resp.Body)
 	require.NoError(err)
 	title_node := cascadia.Query(root, selector("title"))
 	assert.Equal(title_node.FirstChild.Data, "Search | Offline Twitter")
+	assert.Contains(cascadia.Query(root, selector("#search-bar")).Attr, html.Attribute{Key: "value", Val: search_txt})
 
 	tweet_nodes := cascadia.QueryAll(root, selector(".timeline > .tweet"))
 	assert.Len(tweet_nodes, 1)
@@ -339,6 +342,7 @@ func TestSearchUsers(t *testing.T) {
 	require.NoError(err)
 	user_elements := cascadia.QueryAll(root, selector(".users-list-container .user"))
 	assert.Len(user_elements, 2)
+	assert.Contains(cascadia.Query(root, selector("#search-bar")).Attr, html.Attribute{Key: "value", Val: "no"})
 }
 
 // Search bar pasted link redirects
diff --git a/internal/webserver/static/styles.css b/internal/webserver/static/styles.css
index de8579a..5102dc4 100644
--- a/internal/webserver/static/styles.css
+++ b/internal/webserver/static/styles.css
@@ -412,7 +412,7 @@ svg {
     flex-grow: 1;
     display: flex;
 }
-.search-bar {
+#search-bar {
     flex-grow: 1;
 }
 
diff --git a/internal/webserver/tpl/includes/base.tpl b/internal/webserver/tpl/includes/base.tpl
index 050d5d9..3d4f1f8 100644
--- a/internal/webserver/tpl/includes/base.tpl
+++ b/internal/webserver/tpl/includes/base.tpl
@@ -16,7 +16,11 @@
           <img class="svg-icon" src="/static/icons/back.svg" />
         </a>
         <form hx-get="/search" hx-push-url="true" hx-target="body" hx-swap="inner-html show:window:top">
-          <input id="search-bar" name="q" class="search-bar" placeholder="Search" type="text" />
+          <input id="search-bar"
+            name="q"
+            placeholder="Search" type="text"
+            {{with (search_text)}} value="{{.}}" {{end}}
+          />
         </form>
       </div>
       {{template "nav-sidebar"}}