diff --git a/window.c b/window.c
index cf6b1891..6aee42a9 100644
--- a/window.c
+++ b/window.c
@@ -1,4 +1,4 @@
-/* $Id: window.c,v 1.105 2009-09-02 01:02:44 tcunha Exp $ */
+/* $Id: window.c,v 1.106 2009-09-02 01:08:32 tcunha Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -510,6 +510,11 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
 		log_close();
 
 		if (*wp->cmd != '\0') {
+			/* Set SHELL but only if it is currently not useful. */
+			shell = getenv("SHELL");
+			if (shell == NULL || *shell == '\0' || areshell(shell))
+				setenv("SHELL", wp->shell, 1);
+
 			execl(_PATH_BSHELL, "sh", "-c", wp->cmd, (char *) NULL);
 			fatal("execl failed");
 		}
@@ -520,6 +525,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
 			xasprintf(&argv0, "-%s", ptr + 1);
 		else
 			xasprintf(&argv0, "-%s", wp->shell);
+		setenv("SHELL", wp->shell, 1);
 		execl(wp->shell, argv0, (char *) NULL);
 		fatal("execl failed");
 	}