diff --git a/subsys/shell/modules/kernel_service.c b/subsys/shell/modules/kernel_service.c
index 88f86d21509..67b32e49e5b 100644
--- a/subsys/shell/modules/kernel_service.c
+++ b/subsys/shell/modules/kernel_service.c
@@ -20,6 +20,12 @@
 #include <zephyr/logging/log_ctrl.h>
 #endif
 
+#if defined(CONFIG_THREAD_MAX_NAME_LEN)
+#define THREAD_MAX_NAM_LEN CONFIG_THREAD_MAX_NAME_LEN
+#else
+#define THREAD_MAX_NAM_LEN 10
+#endif
+
 static int cmd_kernel_version(const struct shell *shell,
 			      size_t argc, char **argv)
 {
@@ -181,11 +187,10 @@ static void shell_stack_dump(const struct k_thread *thread, void *user_data)
 	/* Calculate the real size reserved for the stack */
 	pcnt = ((size - unused) * 100U) / size;
 
-	shell_print((const struct shell *)user_data,
-		"%p %-10s (real size %zu):\tunused %zu\tusage %zu / %zu (%u %%)",
-		      thread,
-		      tname ? tname : "NA",
-		      size, unused, size - unused, size, pcnt);
+	shell_print(
+		(const struct shell *)user_data, "%p %-" STRINGIFY(THREAD_MAX_NAM_LEN) "s "
+		"(real size %4zu):\tunused %4zu\tusage %4zu / %4zu (%u %%)",
+		thread, tname ? tname : "NA", size, unused, size - unused, size, pcnt);
 }
 
 K_KERNEL_STACK_ARRAY_DECLARE(z_interrupt_stacks, CONFIG_MP_NUM_CPUS,
@@ -196,6 +201,10 @@ static int cmd_kernel_stacks(const struct shell *shell,
 {
 	ARG_UNUSED(argc);
 	ARG_UNUSED(argv);
+	char pad[THREAD_MAX_NAM_LEN] = { 0 };
+
+	memset(pad, ' ', MAX((THREAD_MAX_NAM_LEN - strlen("IRQ 00")), 1));
+
 	k_thread_foreach(shell_stack_dump, (void *)shell);
 
 	/* Placeholder logic for interrupt stack until we have better
@@ -212,10 +221,9 @@ static int cmd_kernel_stacks(const struct shell *shell,
 		__ASSERT_NO_MSG(err == 0);
 
 		shell_print(shell,
-			"%p IRQ %02d     (real size %zu):\tunused %zu\tusage %zu / %zu (%zu %%)",
-			      &z_interrupt_stacks[i], i, size, unused,
-			      size - unused, size,
-			      ((size - unused) * 100U) / size);
+			    "%p IRQ %02d %s(real size %4zu):\tunused %4zu\tusage %4zu / %4zu (%zu %%)",
+			    &z_interrupt_stacks[i], i, pad, size, unused, size - unused, size,
+			    ((size - unused) * 100U) / size);
 	}
 
 	return 0;