diff --git a/CMakeLists.txt b/CMakeLists.txt
index a17dd508..731f09f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,8 @@ set(GLFW_VERSION "${GLFW_VERSION_MAJOR}.${GLFW_VERSION_MINOR}")
 set(GLFW_VERSION_FULL "${GLFW_VERSION}.${GLFW_VERSION_PATCH}${GLFW_VERSION_EXTRA}")
 set(LIB_SUFFIX "" CACHE STRING "Takes an empty string or 64. Directory where lib will be installed: lib or lib64")
 
+set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+
 option(BUILD_SHARED_LIBS "Build shared libraries" OFF)
 option(GLFW_BUILD_EXAMPLES "Build the GLFW example programs" ON)
 option(GLFW_BUILD_TESTS "Build the GLFW test programs" ON)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index 1fc93b0e..229c4a72 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -52,7 +52,7 @@ else()
     add_executable(splitview WIN32 splitview.c)
     add_executable(wave WIN32 wave.c)
 
-    set_target_properties(boing gears particles simple splitview wave PROPERTIES
+    set_target_properties(boing gears heightmap particles simple splitview wave PROPERTIES
                           FOLDER "GLFW3/Examples")
 endif()