diff --git a/cmd-list-keys.c b/cmd-list-keys.c
index 17612449..af3a0208 100644
--- a/cmd-list-keys.c
+++ b/cmd-list-keys.c
@@ -18,6 +18,8 @@
 
 #include <sys/types.h>
 
+#include <string.h>
+
 #include "tmux.h"
 
 /*
@@ -45,6 +47,18 @@ cmd_list_keys_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 	struct key_binding	*bd;
 	const char		*key;
 	char			 tmp[BUFSIZ];
+	int		       	 width, keywidth;
+
+	width = 0;
+	SPLAY_FOREACH(bd, key_bindings, &key_bindings) {
+		if ((key = key_string_lookup_key(bd->key)) == NULL)
+			continue;
+
+		keywidth = strlen(key) + 1;
+		if (keywidth > width)
+			width = keywidth;
+	}
+
 
 	SPLAY_FOREACH(bd, key_bindings, &key_bindings) {
 		if ((key = key_string_lookup_key(bd->key)) == NULL)
@@ -52,7 +66,8 @@ cmd_list_keys_exec(unused struct cmd *self, struct cmd_ctx *ctx)
 
 		*tmp = '\0';
 		cmd_list_print(bd->cmdlist, tmp, sizeof tmp);
-		ctx->print(ctx, "%11s: %s", key, tmp);
+
+		ctx->print(ctx, "%*s: %s", width, key, tmp);
 	}
 
 	return (0);