diff --git a/degesch.c b/degesch.c
index 2485170..19eb68b 100644
--- a/degesch.c
+++ b/degesch.c
@@ -6404,7 +6404,9 @@ handle_buffer_close (struct app_context *ctx, struct handler_args *a)
 			irc_send (buffer->server, "PART %s", buffer->channel->name);
 
 		if (buffer == ctx->current_buffer)
-			buffer_activate (ctx, buffer_next (ctx, 1));
+			buffer_activate (ctx, ctx->last_buffer
+				? ctx->last_buffer
+				: buffer_next (ctx, 1));
 		buffer_remove (ctx, buffer);
 	}
 }