diff --git a/Makefile b/Makefile
index 70f073da..0b27bd45 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ SRCS=	attributes.c cfg.c client.c clock.c \
 	cmd-choose-buffer.c cmd-delete-buffer.c cmd-detach-client.c \
 	cmd-find-window.c cmd-generic.c cmd-has-session.c cmd-kill-pane.c \
 	cmd-kill-server.c cmd-kill-session.c cmd-kill-window.c \
-	cmd-last-window.c cmd-link-window.c cmd-list-buffers.c \
+	cmd-last-pane.c cmd-last-window.c cmd-link-window.c cmd-list-buffers.c \
 	cmd-list-clients.c cmd-list-commands.c cmd-list-keys.c \
 	cmd-list-sessions.c cmd-list-windows.c cmd-list-panes.c \
 	cmd-list.c cmd-load-buffer.c cmd-join-pane.c \
diff --git a/cmd-last-pane.c b/cmd-last-pane.c
new file mode 100644
index 00000000..b59843b7
--- /dev/null
+++ b/cmd-last-pane.c
@@ -0,0 +1,58 @@
+/* $OpenBSD$ */
+
+/*
+ * Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
+ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
+ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include <sys/types.h>
+
+#include "tmux.h"
+
+/*
+ * Move to last pane.
+ */
+
+int	cmd_last_pane_exec(struct cmd *, struct cmd_ctx *);
+
+const struct cmd_entry cmd_last_pane_entry = {
+	"last-pane", "lastp",
+	CMD_TARGET_WINDOW_USAGE,
+	0, "",
+	cmd_target_init,
+	cmd_target_parse,
+	cmd_last_pane_exec,
+	cmd_target_free,
+	cmd_target_print
+};
+
+int
+cmd_last_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
+{
+	struct cmd_target_data	*data = self->data;
+	struct winlink		*wl;
+	struct window		*w;
+
+	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
+		return (-1);
+	w = wl->window;
+
+	if (w->last == NULL) {
+		ctx->error(ctx, "no last pane");
+		return (-1);
+	}
+	window_set_active_pane(w, w->last);
+
+	return (0);
+}
diff --git a/cmd.c b/cmd.c
index b324621c..20cf9cdc 100644
--- a/cmd.c
+++ b/cmd.c
@@ -54,6 +54,7 @@ const struct cmd_entry *cmd_table[] = {
 	&cmd_kill_server_entry,
 	&cmd_kill_session_entry,
 	&cmd_kill_window_entry,
+	&cmd_last_pane_entry,
 	&cmd_last_window_entry,
 	&cmd_link_window_entry,
 	&cmd_list_buffers_entry,
diff --git a/key-bindings.c b/key-bindings.c
index 61d392d3..721620ff 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -124,6 +124,7 @@ key_bindings_init(void)
 		{ '8', 			  0, &cmd_select_window_entry },
 		{ '9', 			  0, &cmd_select_window_entry },
 		{ ':', 			  0, &cmd_command_prompt_entry },
+		{ ';', 			  0, &cmd_last_pane_entry },
 		{ '=', 			  0, &cmd_choose_buffer_entry },
 		{ '?', 			  0, &cmd_list_keys_entry },
 		{ 'D',			  0, &cmd_choose_client_entry },
diff --git a/tmux.1 b/tmux.1
index cd65fed9..86e35e72 100644
--- a/tmux.1
+++ b/tmux.1
@@ -248,6 +248,8 @@ Select windows 0 to 9.
 Enter the
 .Nm
 command prompt.
+.It ;
+Move to the previously active pane.
 .It =
 Choose which buffer to paste interactively from a list.
 .It \&?
@@ -1037,6 +1039,9 @@ option kills all but the pane given with
 Kill the current window or the window at
 .Ar target-window ,
 removing it from any sessions to which it is linked.
+.It Ic last-pane Op Fl t Ar target-window
+.D1 (alias: Ic lastp )
+Select the last (previously selected) pane.
 .It Ic last-window Op Fl t Ar target-session
 .D1 (alias: Ic last )
 Select the last (previously selected) window.
diff --git a/tmux.h b/tmux.h
index 47837851..d851ee2e 100644
--- a/tmux.h
+++ b/tmux.h
@@ -832,6 +832,7 @@ struct window {
 	struct event	 name_timer;
 
 	struct window_pane *active;
+	struct window_pane *last;
 	struct window_panes panes;
 
 	int		 lastlayout;
@@ -1507,6 +1508,7 @@ extern const struct cmd_entry cmd_kill_pane_entry;
 extern const struct cmd_entry cmd_kill_server_entry;
 extern const struct cmd_entry cmd_kill_session_entry;
 extern const struct cmd_entry cmd_kill_window_entry;
+extern const struct cmd_entry cmd_last_pane_entry;
 extern const struct cmd_entry cmd_last_window_entry;
 extern const struct cmd_entry cmd_link_window_entry;
 extern const struct cmd_entry cmd_list_buffers_entry;
diff --git a/window.c b/window.c
index 874f4723..7087e324 100644
--- a/window.c
+++ b/window.c
@@ -325,6 +325,7 @@ window_resize(struct window *w, u_int sx, u_int sy)
 void
 window_set_active_pane(struct window *w, struct window_pane *wp)
 {
+	w->last = w->active;
 	w->active = wp;
 	while (!window_pane_visible(w->active)) {
 		w->active = TAILQ_PREV(w->active, window_panes, entry);
@@ -369,10 +370,15 @@ void
 window_remove_pane(struct window *w, struct window_pane *wp)
 {
 	if (wp == w->active) {
-		w->active = TAILQ_PREV(wp, window_panes, entry);
-		if (w->active == NULL)
-			w->active = TAILQ_NEXT(wp, entry);
-	}
+		w->active = w->last;
+		w->last = NULL;
+		if (w->active == NULL) {
+			w->active = TAILQ_PREV(wp, window_panes, entry);
+			if (w->active == NULL)
+				w->active = TAILQ_NEXT(wp, entry);
+		}
+	} else if (wp == w->last)
+		w->last = NULL;
 
 	TAILQ_REMOVE(&w->panes, wp, entry);
 	window_pane_destroy(wp);