diff --git a/buildscripts/cmake/ExtDepsManifest.cmake b/buildscripts/cmake/ExtDepsManifest.cmake
index ddb67a744d..1b9713af3e 100644
--- a/buildscripts/cmake/ExtDepsManifest.cmake
+++ b/buildscripts/cmake/ExtDepsManifest.cmake
@@ -9,10 +9,6 @@ if (MUSE_MODULE_DRAW)
     require_dep(harfbuzz)
 endif()
 
-if (MUSE_MODULE_DOCKWINDOW AND MUSE_MODULE_DOCKWINDOW_KDDOCKWIDGETS_V2)
-    require_source_dep(kddockwidgets)
-endif()
-
 if (OS_IS_WIN AND MUSE_MODULE_AUDIO)
     require_source_dep(asiosdk)
 endif()
diff --git a/framework/dockwindow_v2/CMakeLists.txt b/framework/dockwindow_v2/CMakeLists.txt
index cfe8cb2d61..7c15affd79 100644
--- a/framework/dockwindow_v2/CMakeLists.txt
+++ b/framework/dockwindow_v2/CMakeLists.txt
@@ -47,11 +47,28 @@ target_sources(muse_dockwindow PRIVATE
 # Setup the KDDockWidgets lib
 ###########################################
 
-kddockwidgets_add_to_build()
+# TODO: use muse_deps
+include(FetchContent)
+
+set(kddockwidgets_src_dir ${FETCHCONTENT_BASE_DIR}/kddockwidgets)
+FetchContent_Declare(kddockwidgets
+    GIT_REPOSITORY https://github.com/musescore/KDDockWidgets.git
+    GIT_TAG main
+    SOURCE_DIR ${kddockwidgets_src_dir}/kddockwidgets
+)
+
+if (NOT BUILD_SHARED_LIBS)
+    set(KDDockWidgets_STATIC ON CACHE BOOL "Build static versions of the libraries" FORCE)
+endif()
+set(KDDockWidgets_QT6 ON CACHE BOOL "Build against Qt 6" FORCE)
+set(KDDockWidgets_FRONTENDS "qtquick" CACHE STRING "Frontends to build" FORCE)
+set(KDDockWidgets_EXAMPLES OFF CACHE BOOL "Build the examples" FORCE)
+set(KDDockWidgets_TESTS OFF CACHE BOOL "Build the tests" FORCE)
+
+FetchContent_MakeAvailable(kddockwidgets)
 
 target_link_libraries(muse_dockwindow PRIVATE kddockwidgets)
 
-get_property(kddockwidgets_src_dir GLOBAL PROPERTY kddockwidgets_SOURCE_DIR)
 target_include_directories(muse_dockwindow SYSTEM PRIVATE
     ${kddockwidgets_src_dir}
     ${kddockwidgets_src_dir}/kddockwidgets/src