diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index 730c2bdf7..2eee25a3f 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -105,7 +105,6 @@ target_sources_ifdef(CONFIG_ZMK_USB app PRIVATE src/usb_hid.c)
 target_sources_ifdef(CONFIG_ZMK_RGB_UNDERGLOW app PRIVATE src/rgb_underglow.c)
 target_sources_ifdef(CONFIG_ZMK_BACKLIGHT app PRIVATE src/backlight.c)
 target_sources_ifdef(CONFIG_ZMK_LOW_PRIORITY_WORK_QUEUE app PRIVATE src/workqueue.c)
-target_sources_ifdef(CONFIG_ZMK_BOOT_MAGIC_COMBO app PRIVATE src/boot_magic_combo.c)
 target_sources(app PRIVATE src/main.c)
 
 add_subdirectory(src/display/)
diff --git a/app/src/boot/CMakeLists.txt b/app/src/boot/CMakeLists.txt
index 264c1aa7d..d8c4e57ca 100644
--- a/app/src/boot/CMakeLists.txt
+++ b/app/src/boot/CMakeLists.txt
@@ -2,3 +2,4 @@
 target_sources_ifdef(CONFIG_ZMK_BOOTMODE_TO_MAGIC_VALUE_MAPPER app PRIVATE bootmode_to_magic_mapper.c)
 target_sources_ifdef(CONFIG_ZMK_DBL_TAP_BOOTLOADER app PRIVATE dbl_tap_bootloader.c)
 target_sources_ifdef(CONFIG_ZMK_BOOT_STM32_ENFORCE_NBOOT_SEL app PRIVATE stm32_enforce_nboot_sel.c)
+target_sources_ifdef(CONFIG_ZMK_BOOT_MAGIC_COMBO app PRIVATE boot_magic_combo.c)
\ No newline at end of file
diff --git a/app/src/boot_magic_combo.c b/app/src/boot/boot_magic_combo.c
similarity index 95%
rename from app/src/boot_magic_combo.c
rename to app/src/boot/boot_magic_combo.c
index 81e925fcf..46f8f0919 100644
--- a/app/src/boot_magic_combo.c
+++ b/app/src/boot/boot_magic_combo.c
@@ -41,9 +41,8 @@ struct boot_key_config {
     static const uint16_t boot_key_combo_positions_##n[] = DT_INST_PROP(n, combo_positions);
 
 #define BOOT_KEY_CONFIG(n)                                                                         \
-    BOOT_KEY_COMBO_POSITIONS(n)                                                                   \
-    {                                                                                              \
-        .combo_positions = boot_key_combo_positions_##n,                                          \
+    BOOT_KEY_COMBO_POSITIONS(n){                                                                   \
+        .combo_positions = boot_key_combo_positions_##n,                                           \
         .combo_positions_len = DT_INST_PROP_LEN(n, combo_positions),                               \
         .jump_to_bootloader = DT_INST_PROP_OR(n, jump_to_bootloader, false),                       \
         .reset_settings = DT_INST_PROP_OR(n, reset_settings, false),                               \