diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index d1fb20b..f504d15 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -306,14 +306,12 @@ set -g status-left "#{prefix_highlight}"
 
 set -g status-justify centre
 
-# Display window_index and window_name as status and underline it when the
+# Display window_index and window_name as status and highlight it when the
 # active pane is zoomed.
-%hidden window_status='#{?window_zoomed_flag,#[underscore],}#I #W'
 set -g window-status-current-format \
-	"#[fg=#{@accent_color} bold]"$window_status
+	"#{?window_zoomed_flag,#[fg=#{@text_fg} bg=#{@accent_color} underscore],#[fg=#{@accent_color} bold]}#I #W"
 set -g window-status-format \
-	"#[fg=#{@ui_color}]"$window_status
-setenv -ghu window_status
+	"#[fg=#{@ui_color}]#{?window_zoomed_flag,#[underscore],}#I #W"
 
 # Initialize TMUX plugin manager. Keep this line at the very bottom.
 run -b "$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm"