diff --git a/cmake/MacApp.cmake b/cmake/MacApp.cmake
index dfd029473..47072b2f8 100644
--- a/cmake/MacApp.cmake
+++ b/cmake/MacApp.cmake
@@ -73,3 +73,6 @@ add_custom_target(signed_fish_macapp
             $<TARGET_BUNDLE_DIR:fish_macapp>
     VERBATIM
 )
+
+# Group our targets in a folder.
+set_property(TARGET fish_macapp signed_fish_macapp PROPERTY FOLDER macapp)
diff --git a/cmake/gettext.cmake b/cmake/gettext.cmake
index 63e495156..d63ef983b 100644
--- a/cmake/gettext.cmake
+++ b/cmake/gettext.cmake
@@ -15,12 +15,15 @@ add_feature_info(gettext GETTEXT_FOUND "translate messages with gettext")
 
 # Define translations
 if(GETTEXT_FOUND)
+  # Group pofile targets into their own folder, as there's a lot of them.
+  set(CMAKE_FOLDER pofiles)
   foreach(lang ${languages})
     # Our translations aren't set up entirely as CMake expects, so installation is done in
     # cmake/Install.cmake instead of using INSTALL_DESTINATION
     gettext_process_po_files(${lang} ALL
                              PO_FILES po/${lang}.po)
   endforeach()
+  set(CMAKE_FOLDER)
 endif()
 
 cmake_push_check_state()