diff --git a/lib/python/qmk/path.py b/lib/python/qmk/path.py
index 54def1d5d6c..47dd0af05af 100644
--- a/lib/python/qmk/path.py
+++ b/lib/python/qmk/path.py
@@ -50,8 +50,9 @@ def keymap(keyboard_name):
 
         keyboard_folder = keyboard_folder.parent
 
-    logging.error('Could not find the keymaps directory!')
-    raise NoSuchKeyboardError('Could not find keymaps directory for: %s' % keyboard_name)
+    keyboard_folder = keyboard(keyboard_name) / 'keymaps'
+    logging.debug('Could not find the keymaps directory, creating as %s', keyboard_folder)
+    keyboard_folder.mkdir(parents=True)
 
 
 def normpath(path):