diff --git a/degesch.c b/degesch.c
index f65292a..64280c8 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1291,13 +1291,22 @@ refresh_prompt (struct app_context *ctx)
 			str_append_printf (&prompt, "(%s) ", unseen_prefix);
 		free (unseen_prefix);
 
-		str_append (&prompt, buffer->name);
-		if (buffer->type == BUFFER_CHANNEL)
-			str_append_printf (&prompt, "(%s)", buffer->mode);
-		str_append_c (&prompt, ' ');
+		int buffer_index = 1;
+		for (struct buffer *iter = ctx->buffers;
+			iter && iter != buffer; iter = iter->next)
+			buffer_index++;
 
-		str_append (&prompt, ctx->irc_nickname);
-		str_append_printf (&prompt, "(%s)", ctx->irc_user_mode);
+		str_append_printf (&prompt, "%d:%s", buffer_index, buffer->name);
+		if (buffer->type == BUFFER_CHANNEL && *buffer->mode)
+			str_append_printf (&prompt, "(%s)", buffer->mode);
+
+		if (buffer != ctx->global_buffer)
+		{
+			str_append_c (&prompt, ' ');
+			str_append (&prompt, ctx->irc_nickname);
+			if (*ctx->irc_user_mode)
+				str_append_printf (&prompt, "(%s)", ctx->irc_user_mode);
+		}
 
 		str_append_c (&prompt, ']');
 	}