===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/window.c,v
retrieving revision 1.222
retrieving revision 1.223
diff -u -r1.222 -r1.223
--- src/usr.bin/tmux/window.c	2019/03/18 14:10:25	1.222
+++ src/usr.bin/tmux/window.c	2019/03/18 15:25:36	1.223
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.222 2019/03/18 14:10:25 nicm Exp $ */
+/* $OpenBSD: window.c,v 1.223 2019/03/18 15:25:36 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -1247,16 +1247,17 @@
 		if (wme->mode == mode)
 			break;
 	}
-	if (wme != NULL)
+	if (wme != NULL) {
 		TAILQ_REMOVE(&wp->modes, wme, entry);
-	else {
+		TAILQ_INSERT_HEAD(&wp->modes, wme, entry);
+	} else {
 		wme = xcalloc(1, sizeof *wme);
 		wme->wp = wp;
 		wme->mode = mode;
 		wme->prefix = 1;
+		TAILQ_INSERT_HEAD(&wp->modes, wme, entry);
 		wme->screen = wme->mode->init(wme, fs, args);
 	}
-	TAILQ_INSERT_HEAD(&wp->modes, wme, entry);
 
 	wp->screen = wme->screen;
 	wp->flags |= (PANE_REDRAW|PANE_CHANGED);