diff --git a/Makefile.unix b/Makefile.unix
index a6913ad672a..a411eda177f 100644
--- a/Makefile.unix
+++ b/Makefile.unix
@@ -480,24 +480,36 @@ pass2dep: context tools/mkdeps$(HOSTEXEEXT) tools/cnvwindeps$(HOSTEXEEXT)
 # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends.  See
 # README.txt file in the NuttX tools GIT repository for additional information.
 
-config: context apps_preconfig
+do_config: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf Kconfig
 
-oldconfig: context apps_preconfig
+config: do_config clean_context
+
+do_oldconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --oldconfig Kconfig
 
-olddefconfig: context apps_preconfig
+oldconfig: do_oldconfig clean_context
+
+do_olddefconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-conf --olddefconfig Kconfig
 
-menuconfig: context apps_preconfig
+olddefconfig: do_olddefconfig clean_context
+
+do_menuconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-mconf Kconfig
 
-qconfig: context apps_preconfig
+menuconfig: do_menuconfig clean_context
+
+do_qconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-qconf Kconfig
 
+qconfig: do_qconfig clean_context
+
 gconfig: context apps_preconfig
 	$(Q) APPSDIR=${CONFIG_APPS_DIR} kconfig-gconf Kconfig
 
+gconfig: do_gconfig clean_context
+
 # export
 #
 # The export target will package the NuttX libraries and header files into
diff --git a/Makefile.win b/Makefile.win
index c1ab6a7ceff..484e6a938d3 100644
--- a/Makefile.win
+++ b/Makefile.win
@@ -480,18 +480,26 @@ pass2dep: context tools\mkdeps$(HOSTEXEEXT)
 # location: http://ymorin.is-a-geek.org/projects/kconfig-frontends.  See
 # misc\tools\README.txt for additional information.
 
-config: context apps_preconfig
+do_config: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf Kconfig
 
-oldconfig: context apps_preconfig
+config: do_config clean_context
+
+do_oldconfig: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --oldconfig Kconfig
 
-olddefconfig: context apps_preconfig
+oldconfig: do_oldconfig clean_context
+
+do_olddefconfig: context apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-conf --olddefconfig Kconfig
 
-menuconfig: context configenv apps_preconfig
+olddefconfig: do_olddefconfig clean_context
+
+do_menuconfig: context configenv apps_preconfig
 	$(Q) set APPSDIR=$(patsubst "%",%,${CONFIG_APPS_DIR})& kconfig-mconf Kconfig
 
+menuconfig: do_menuconfig clean_context
+
 # export
 #
 # The export target will package the NuttX libraries and header files into