===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.258
retrieving revision 1.259
diff -u -r1.258 -r1.259
--- src/usr.bin/tmux/window.c	2020/05/16 14:53:23	1.258
+++ src/usr.bin/tmux/window.c	2020/05/16 15:01:31	1.259
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.258 2020/05/16 14:53:23 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.259 2020/05/16 15:01:31 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -865,6 +865,9 @@
 	wp->fd = -1;
 	wp->event = NULL;
 
+	wp->fg = 8;
+	wp->bg = 8;
+
 	TAILQ_INIT(&wp->modes);
 
 	wp->layout_cell = NULL;
@@ -1096,6 +1099,7 @@
 	wp->screen = wme->screen;
 	wp->flags |= (PANE_REDRAW|PANE_CHANGED);
 
+	server_redraw_window_borders(wp->window);
 	server_status_window(wp->window);
 	notify_pane("pane-mode-changed", wp);
 
@@ -1127,6 +1131,7 @@
 	}
 	wp->flags |= (PANE_REDRAW|PANE_CHANGED);
 
+	server_redraw_window_borders(wp->window);
 	server_status_window(wp->window);
 	notify_pane("pane-mode-changed", wp);
 }