diff --git a/src/configuration/ArcanistConfiguration.php b/src/configuration/ArcanistConfiguration.php
index b95e1a88..0d0f4336 100644
--- a/src/configuration/ArcanistConfiguration.php
+++ b/src/configuration/ArcanistConfiguration.php
@@ -204,7 +204,7 @@ class ArcanistConfiguration {
     asort($distances);
     $best = min($max_distance, reset($distances));
     foreach ($distances as $option => $distance) {
-      if ($distance > $best) {
+      if ($distance > $best || strlen($option) <= 2 * $distance) {
         unset($distances[$option]);
       }
     }