From 5dd5d4dd60cfc1c39a6b0d56314eb2869aa26cb0 Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Tue, 10 Feb 2026 08:10:12 +0000
Subject: [PATCH] Correctly resolve keyboard alias during 'qmk new-keymap'
 (#25570)

---
 lib/python/qmk/cli/new/keymap.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lib/python/qmk/cli/new/keymap.py b/lib/python/qmk/cli/new/keymap.py
index 4d19a726a4..39f5a6df2e 100755
--- a/lib/python/qmk/cli/new/keymap.py
+++ b/lib/python/qmk/cli/new/keymap.py
@@ -57,7 +57,13 @@ def prompt_keyboard():
 If you're unsure you can view a full list of supported keyboards with {fg_yellow}qmk list-keyboards{style_reset_all}.
 
 Keyboard Name? """
-    return question(prompt)
+    kb_name = question(prompt)
+
+    try:
+        # Resolve any keyboard alias
+        return keyboard_folder(kb_name)
+    except ValueError:
+        return None
 
 
 def prompt_user():
@@ -105,9 +111,7 @@ def new_keymap(cli):
     converter = cli.config.new_keymap.converter if cli.args.skip_converter or cli.config.new_keymap.converter else prompt_converter(kb_name)
 
     # check directories
-    try:
-        kb_name = keyboard_folder(kb_name)
-    except ValueError:
+    if not is_keyboard(kb_name):
         cli.log.error(f'Keyboard {{fg_cyan}}{kb_name}{{fg_reset}} does not exist! Please choose a valid name.')
         return False