diff --git a/degesch.c b/degesch.c
index 9d31b5c..5e70397 100644
--- a/degesch.c
+++ b/degesch.c
@@ -4235,11 +4235,11 @@ buffer_rename (struct app_context *ctx,
 	str_map_set (&ctx->buffers_by_name, buffer->name, NULL);
 	str_map_set (&ctx->buffers_by_name, new_name, buffer);
 
+	cstr_set (&buffer->name, xstrdup (new_name));
+
 	buffer_close_log_file (buffer);
 	buffer_open_log_file (ctx, buffer);
 
-	cstr_set (&buffer->name, xstrdup (new_name));
-
 	// We might have renamed the current buffer
 	refresh_prompt (ctx);
 }