diff --git a/cmd-kill-pane.c b/cmd-kill-pane.c
index d3a54c92..b501e416 100644
--- a/cmd-kill-pane.c
+++ b/cmd-kill-pane.c
@@ -61,8 +61,9 @@ cmd_kill_pane_exec(struct cmd *self, struct cmd_ctx *ctx)
 	}
 
 	if (window_count_panes(wl->window) == 1) {
-		ctx->error(ctx, "can't kill pane: %d", data->pane);
-		return (-1);
+		/* Only one pane, kill the window. */
+		server_kill_window(wl->window);
+		return (0);
 	}
 
 	window_remove_pane(wl->window, wp);
diff --git a/cmd-kill-window.c b/cmd-kill-window.c
index 77b9b79d..66d8be88 100644
--- a/cmd-kill-window.c
+++ b/cmd-kill-window.c
@@ -44,37 +44,11 @@ cmd_kill_window_exec(struct cmd *self, struct cmd_ctx *ctx)
 {
 	struct cmd_target_data	*data = self->data;
 	struct winlink		*wl;
-	struct window		*w;
-	struct session		*s;
-	struct client		*c;
-	u_int		 	 i, j;
-	int		 	 destroyed;
 
 	if ((wl = cmd_find_window(ctx, data->target, NULL)) == NULL)
 		return (-1);
-	w = wl->window;
 
-	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
-		s = ARRAY_ITEM(&sessions, i);
-		if (s == NULL || !session_has(s, w))
-			continue;
-		if ((wl = winlink_find_by_window(&s->windows, w)) == NULL)
-			continue;
-
-		destroyed = session_detach(s, wl);
-		for (j = 0; j < ARRAY_LENGTH(&clients); j++) {
-			c = ARRAY_ITEM(&clients, j);
-			if (c == NULL || c->session != s)
-				continue;
-
-			if (destroyed) {
-				c->session = NULL;
-				server_write_client(c, MSG_EXIT, NULL, 0);
-			} else
-				server_redraw_client(c);
-		}
-	}
-	recalculate_sizes();
+	server_kill_window(wl->window);
 
 	return (0);
 }
diff --git a/server-fn.c b/server-fn.c
index d6cec8f9..3080bed4 100644
--- a/server-fn.c
+++ b/server-fn.c
@@ -228,3 +228,36 @@ wrong:
 
 	return (-1);
 }
+
+void
+server_kill_window(struct window *w)
+{
+	struct session	*s;
+	struct winlink	*wl;
+	struct client	*c;
+	u_int		 i, j;
+	int		 destroyed;
+
+	
+	for (i = 0; i < ARRAY_LENGTH(&sessions); i++) {
+		s = ARRAY_ITEM(&sessions, i);
+		if (s == NULL || !session_has(s, w))
+			continue;
+		if ((wl = winlink_find_by_window(&s->windows, w)) == NULL)
+			continue;
+		
+		destroyed = session_detach(s, wl);
+		for (j = 0; j < ARRAY_LENGTH(&clients); j++) {
+			c = ARRAY_ITEM(&clients, j);
+			if (c == NULL || c->session != s)
+				continue;
+			
+			if (destroyed) {
+				c->session = NULL;
+				server_write_client(c, MSG_EXIT, NULL, 0);
+			} else
+				server_redraw_client(c);
+		}
+	}
+	recalculate_sizes();
+}
diff --git a/tmux.1 b/tmux.1
index 9b2f344c..af7ad53d 100644
--- a/tmux.1
+++ b/tmux.1
@@ -768,6 +768,7 @@ returns success.
 .Xc
 .D1 (alias: Ic killp )
 Destroy the given pane.
+If no panes remain in the containing window, it is also destroyed.
 .It Xo Ic kill-server
 .Xc
 Kill the
diff --git a/tmux.h b/tmux.h
index 2a0412ba..d6bfcc4b 100644
--- a/tmux.h
+++ b/tmux.h
@@ -1284,6 +1284,7 @@ void	 server_redraw_window(struct window *);
 void	 server_status_window(struct window *);
 void	 server_lock(void);
 int	 server_unlock(const char *);
+void	 server_kill_window(struct window *);
 
 /* status.c */
 int	 status_redraw(struct client *);