diff --git a/console/CMakeLists.txt b/console/CMakeLists.txt
index 576aaf0747..86bb1a38b6 100644
--- a/console/CMakeLists.txt
+++ b/console/CMakeLists.txt
@@ -5,11 +5,18 @@ if (PRODUCTION_BUILD)
 endif()
 
 # add a target that will package the console
-add_custom_target(${TARGET_NAME} ALL
-  npm install
-  COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} ${PRODUCTION_OPTION}
+add_custom_target(${TARGET_NAME}-npm-install
+  COMMAND npm install
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
 )
+add_custom_target(${TARGET_NAME}
+  COMMAND npm run packager -- --out ${CMAKE_CURRENT_BINARY_DIR} ${PRODUCTION_OPTION}
+  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+  DEPENDS ${TARGET_NAME}-npm-install
+)
+
+set_target_properties(${TARGET_NAME} PROPERTIES FOLDER "Console")
+set_target_properties(${TARGET_NAME}-npm-install PROPERTIES FOLDER "Console")
 
 # add a dependency from the package target to the server components
 add_dependencies(${TARGET_NAME} assignment-client domain-server)