diff --git a/Source/Tools/BindingGenerator/CMakeLists.txt b/Source/Tools/BindingGenerator/CMakeLists.txt
index 5f6211615e5..d24bca7c3d6 100644
--- a/Source/Tools/BindingGenerator/CMakeLists.txt
+++ b/Source/Tools/BindingGenerator/CMakeLists.txt
@@ -64,3 +64,6 @@ set (LIBS PugiXml)
 
 # Setup target
 setup_executable (TOOL NODEPS)
+
+# Preventing VS from placing cpp and h files to different groups 
+source_group (TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SOURCE_FILES})