diff --git a/internal/webserver/handler_messages.go b/internal/webserver/handler_messages.go
index b5a97a1..9446b89 100644
--- a/internal/webserver/handler_messages.go
+++ b/internal/webserver/handler_messages.go
@@ -49,6 +49,7 @@ func (app *Application) Messages(w http.ResponseWriter, r *http.Request) {
 			app.buffered_render_htmx(w, "dm-composer", global_data, chat_view_data) // Wipe the chat box
 			go app.Profile.SaveDMTrove(trove, true)
 		}
+
 		chat_view_data.ActiveRoomID = room_id
 		chat_view_data.LatestPollingTimestamp = -1
 		if latest_timestamp_str := r.URL.Query().Get("latest_timestamp"); latest_timestamp_str != "" {
diff --git a/internal/webserver/handler_tweet_detail.go b/internal/webserver/handler_tweet_detail.go
index 391f930..e673cb7 100644
--- a/internal/webserver/handler_tweet_detail.go
+++ b/internal/webserver/handler_tweet_detail.go
@@ -134,7 +134,12 @@ func (app *Application) TweetDetail(w http.ResponseWriter, r *http.Request) {
 
 	data.TweetDetailView = twt_detail
 
-	app.buffered_render_page(w, "tpl/tweet_detail.tpl", PageGlobalData{TweetTrove: twt_detail.TweetTrove}, data)
+	app.buffered_render_page(
+		w,
+		"tpl/tweet_detail.tpl",
+		PageGlobalData{TweetTrove: twt_detail.TweetTrove, FocusedTweetID: data.MainTweetID},
+		data,
+	)
 }
 
 type key string