diff --git a/CMakeLists.txt b/CMakeLists.txt
index d0444d7..6c4662a 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,5 +74,7 @@ add_subdirectory(platforms)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 
+source_group(Shaders shaders)
+
 add_subdirectory(engine)
 add_subdirectory(tools)
\ No newline at end of file
diff --git a/cmake/BuildShaders.cmake b/cmake/BuildShaders.cmake
index 9525850..1d1310c 100755
--- a/cmake/BuildShaders.cmake
+++ b/cmake/BuildShaders.cmake
@@ -32,8 +32,11 @@ function(add_shader)
             compile_shader(${shader})
 
             list(APPEND SPV_FILES ${CMAKE_BINARY_DIR}/${MYFILE_WITHOUT_EXT}.glsl)
+            list(APPEND SRC_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../${shader})
         endforeach()
 
+        add_custom_target(Shaders SOURCES ${SRC_FILES})
+
         file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/shaders)
 
         add_custom_target(BuildShaders DEPENDS ${SPV_FILES} ShaderCompilerTool)