diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0e8e0602a..3c4fd38cf6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2441,6 +2441,9 @@ if(BUILD_wireshark AND QT_FOUND)
 		LINK_FLAGS "${WS_LINK_FLAGS}"
 		FOLDER "Executables"
 		INSTALL_RPATH "${EXECUTABLE_INSTALL_RPATH}"
+		AUTOMOC ON
+		AUTOUIC ON
+		AUTORCC ON
 	)
 	if(MSVC)
 		set_target_properties(wireshark PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
diff --git a/ui/qt/CMakeLists.txt b/ui/qt/CMakeLists.txt
index 173653ebf4..06d7af30f3 100644
--- a/ui/qt/CMakeLists.txt
+++ b/ui/qt/CMakeLists.txt
@@ -730,18 +730,13 @@ target_compile_definitions(qtui
 set_target_properties(qtui PROPERTIES
 	LINK_FLAGS "${WS_LINK_FLAGS}"
 	FOLDER "UI"
+	AUTOMOC ON
+	AUTOUIC ON
+	AUTORCC ON
 	# Ensure .qm files are generated before autogenerating i18n.qrc
 	AUTOGEN_TARGET_DEPENDS "${WIRESHARK_QT_QM}"
 )
 
-if (NOT CMAKE_AUTOMOC) # Set in the top-level CMakeLists.txt if we're using CMake 3.20.0 or .1
-	set_target_properties(qtui PROPERTIES
-		AUTOMOC ON
-		AUTOUIC ON
-		AUTORCC ON
-	)
-endif()
-
 if(MSVC)
 	set_target_properties(qtui PROPERTIES LINK_FLAGS_DEBUG "${WS_MSVC_DEBUG_LINK_FLAGS}")
 endif()