diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8f2a176..9bcd6769 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,15 @@ target_link_libraries(boost_unordered
     Boost::throw_exception
 )
 
+if(CMAKE_VERSION VERSION_GREATER 3.18 AND CMAKE_GENERATOR MATCHES "Visual Studio")
+
+  file(GLOB_RECURSE boost_unordered_IDEFILES CONFIGURE_DEPENDS include/*.hpp)
+  source_group(TREE ${PROJECT_SOURCE_DIR}/include FILES ${boost_unordered_IDEFILES} PREFIX "Header Files")
+  list(APPEND boost_unordered_IDEFILES extra/boost_unordered.natvis)
+  target_sources(boost_unordered PRIVATE ${boost_unordered_IDEFILES})
+
+endif()
+
 target_compile_features(boost_unordered INTERFACE cxx_std_11)
 
 if(BUILD_TESTING AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/test/CMakeLists.txt")
diff --git a/extra/boost_unordered.natvis b/extra/boost_unordered.natvis
new file mode 100644
index 00000000..befb2355
--- /dev/null
+++ b/extra/boost_unordered.natvis
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright 2024 Braden Ganetsky.
+Distributed under the Boost Software License, Version 1.0. (See accompanying
+file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+-->
+
+<AutoVisualizer xmlns="http://schemas.microsoft.com/vstudio/debugger/natvis/2010">
+
+</AutoVisualizer>