diff --git a/degesch.c b/degesch.c
index 73ce587..998f58a 100644
--- a/degesch.c
+++ b/degesch.c
@@ -1396,12 +1396,8 @@ on_readline_goto_buffer (int count, int key)
 	if (n < 0 || n > 9)
 		return 0;
 
-	// There's no zero-th buffer
-	if (n == 0)
-		n = 10;
-
 	struct app_context *ctx = g_ctx;
-	if (!buffer_goto (ctx, n))
+	if (!buffer_goto (ctx, n == 0 ? 10 : n))
 		rl_ding ();
 	return 0;
 }