1 files changed, 1 insertions, 0 deletions
diff --git a/tmux.c b/tmux.c
index db86dc52..137c7eeb 100644
--- a/tmux.c
+++ b/tmux.c
@@ -443,6 +443,7 @@ main(int argc, char **argv)
 
 	/* Override keys to vi if VISUAL or EDITOR are set. */
 	if ((s = getenv("VISUAL")) != NULL || (s = getenv("EDITOR")) != NULL) {
+		options_set_string(global_options, "editor", 0, "%s", s);
 		if (strrchr(s, '/') != NULL)
 			s = strrchr(s, '/') + 1;
 		if (strstr(s, "vi") != NULL)