diff --git a/app/boards/shields/nibble/Kconfig.defconfig b/app/boards/shields/nibble/Kconfig.defconfig
index 22ef1c69..2df1d812 100644
--- a/app/boards/shields/nibble/Kconfig.defconfig
+++ b/app/boards/shields/nibble/Kconfig.defconfig
@@ -9,7 +9,6 @@ config ZMK_KEYBOARD_NAME
 config ZMK_USB
 	default y
 
-endif
 
 if ZMK_DISPLAY
 
@@ -46,3 +45,5 @@ choice LVGL_COLOR_DEPTH
 endchoice
 
 endif # LVGL
+
+endif
diff --git a/app/boards/shields/tidbit/Kconfig.defconfig b/app/boards/shields/tidbit/Kconfig.defconfig
index 30cf3c22..177e2675 100644
--- a/app/boards/shields/tidbit/Kconfig.defconfig
+++ b/app/boards/shields/tidbit/Kconfig.defconfig
@@ -6,7 +6,6 @@ if SHIELD_TIDBIT
 config ZMK_KEYBOARD_NAME
 	default "tidbit"
 
-endif
 
 if ZMK_DISPLAY
 
@@ -43,3 +42,5 @@ choice LVGL_COLOR_DEPTH
 endchoice
 
 endif # LVGL
+
+endif