diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1525e2b3c..c56b45048 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -268,19 +268,21 @@ if(ENABLE_GTK)
     tr_get_required_flag(ENABLE_GTK GTK_IS_REQUIRED)
 
     if(USE_GTK_VERSION STREQUAL "AUTO" OR USE_GTK_VERSION EQUAL 4)
-        pkg_check_modules(GTK
+        pkg_check_modules(GTK4
             gtkmm-4.0>=${GTKMM_MINIMUM}
             glibmm-2.68>=${GLIBMM_MINIMUM}
             giomm-2.68>=${GIOMM_MINIMUM})
         set(GTK_VERSION 4)
+        set(GTK_FOUND ${GTK4_FOUND})
     endif()
 
     if(NOT GTK_FOUND AND (USE_GTK_VERSION STREQUAL "AUTO" OR USE_GTK_VERSION EQUAL 3))
-        pkg_check_modules(GTK ${GTK_IS_REQUIRED}
+        pkg_check_modules(GTK3
             gtkmm-3.0>=${GTKMM_MINIMUM}
             glibmm-2.4>=${GLIBMM_MINIMUM}
             giomm-2.4>=${GIOMM_MINIMUM})
         set(GTK_VERSION 3)
+        set(GTK_FOUND ${GTK3_FOUND})
     endif()
 
     if(GTK_IS_REQUIRED AND NOT GTK_FOUND)
diff --git a/gtk/CMakeLists.txt b/gtk/CMakeLists.txt
index ba2da57aa..d9a8c3316 100644
--- a/gtk/CMakeLists.txt
+++ b/gtk/CMakeLists.txt
@@ -164,14 +164,17 @@ include_directories(
 )
 include_directories(
     SYSTEM
-    ${LIBAPPINDICATOR_INCLUDE_DIRS}
-    ${GTK_INCLUDE_DIRS}
+    ${GTK${GTK_VERSION}_INCLUDE_DIRS}
     ${CURL_INCLUDE_DIRS}
     ${EVENT2_INCLUDE_DIRS}
 )
 
+if(WITH_LIBAPPINDICATOR)
+    include_directories(SYSTEM ${LIBAPPINDICATOR_INCLUDE_DIRS})
+endif()
+
 link_directories(
-    ${GTK_LIBRARY_DIRS}
+    ${GTK${GTK_VERSION}_LIBRARY_DIRS}
 )
 
 add_definitions(
@@ -191,7 +194,7 @@ add_definitions(
     -DGTKMM_DISABLE_DEPRECATED
     -DPANGOMM_DISABLE_DEPRECATED
     -DSIGCXX_DISABLE_DEPRECATED
-    ${GTK_CFLAGS_OTHER}
+    ${GTK${GTK_VERSION}_CFLAGS_OTHER}
 )
 
 tr_win32_app_info(${PROJECT_NAME}_WIN32_RC_FILE
@@ -210,12 +213,15 @@ add_executable(${TR_NAME}-gtk WIN32
 
 target_link_libraries(${TR_NAME}-gtk
     ${TR_NAME}
-    ${LIBAPPINDICATOR_LIBRARIES}
-    ${GTK_LIBRARIES}
+    ${GTK${GTK_VERSION}_LIBRARIES}
     ${CURL_LIBRARIES}
     ${EVENT2_LIBRARIES}
 )
 
+if(WITH_LIBAPPINDICATOR)
+    target_link_libraries(${TR_NAME}-gtk ${LIBAPPINDICATOR_LIBRARIES})
+endif()
+
 if(NOT MSVC)
     target_compile_options(${TR_NAME}-gtk PRIVATE -Wno-exit-time-destructors)
 endif()