diff --git a/maintainer/kconfig-versions.template b/maintainer/kconfig-versions.template
index 19693548..51bb28c0 100644
--- a/maintainer/kconfig-versions.template
+++ b/maintainer/kconfig-versions.template
@@ -68,6 +68,8 @@ config @@fork|@@_SRC_DEVEL
       Default is the vendor repository at @@repository_url@@
 #!end-if
 
+endchoice
+
 if @@fork|@@_SRC_DEVEL
 
 choice
@@ -176,8 +178,6 @@ config @@fork|@@_CUSTOM_LOCATION
 
 endif
 
-endchoice
-
 if EXPERIMENTAL
 choice
     bool "@@pkg_label@@ patches origin"