diff --git a/.clang-tidy b/.clang-tidy
index 508250276..0f0dc3fd2 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 ---
-Checks:          'clang-diagnostic-*,clang-analyzer-*,cert-*,performance-*,portability-*,modernize-use-auto'
+Checks:          'clang-diagnostic-*,clang-analyzer-*,cert-*,performance-*,portability-*,modernize-use-auto,modernize-loop-convert'
 WarningsAsErrors: ''
 HeaderFilterRegex: ''
 AnalyzeTemporaryDtors: false
@@ -9,6 +9,8 @@ CheckOptions:
     value:           'L;LL;LU;LLU'
   - key:             cert-oop54-cpp.WarnOnlyIfThisHasSuspiciousField
     value:           '0'
+  - key:             modernize-loop-convert.MinConfidence
+    value:           'risky'
   - key:             modernize-use-auto.RemoveStars
     value:           '1'
 ...
diff --git a/src/color.cpp b/src/color.cpp
index c80195c49..aea715738 100644
--- a/src/color.cpp
+++ b/src/color.cpp
@@ -173,9 +173,9 @@ wcstring_list_t rgb_color_t::named_color_names() {
     const size_t count = sizeof named_colors / sizeof *named_colors;
     wcstring_list_t result;
     result.reserve(1 + count);
-    for (size_t i = 0; i < count; i++) {
-        if (!named_colors[i].hidden) {
-            result.push_back(named_colors[i].name);
+    for (const auto &named_color : named_colors) {
+        if (!named_color.hidden) {
+            result.push_back(named_color.name);
         }
     }
     // "normal" isn't really a color and does not have a color palette index or