diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
index 9d8f904..9c998b8 100644
--- a/tools/CMakeLists.txt
+++ b/tools/CMakeLists.txt
@@ -1,2 +1,6 @@
 add_subdirectory(bndl_util)
-add_subdirectory(bndl_edit)
+
+option(LIBBNDL_BUILD_UI "Build UI tools" OFF)
+if(LIBBNDL_BUILD_UI)
+	add_subdirectory(bndl_edit)
+endif()
diff --git a/tools/bndl_edit/CMakeLists.txt b/tools/bndl_edit/CMakeLists.txt
index fa96b56..baf6c52 100644
--- a/tools/bndl_edit/CMakeLists.txt
+++ b/tools/bndl_edit/CMakeLists.txt
@@ -2,8 +2,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
 # Find Qt Library
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5Multimedia REQUIRED)
+find_package(Qt5 COMPONENTS Widgets Multimedia REQUIRED)
 
 add_executable(bndl_edit WIN32 main.cpp editor.cpp editor.hpp)