diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c
index 0cc0ce72e..12e0a3825 100644
--- a/rigs/yaesu/newcat.c
+++ b/rigs/yaesu/newcat.c
@@ -6334,13 +6334,13 @@ static int set_roofing_filter_for_width(RIG *rig, vfo_t vfo, int width)
             continue;
         }
 
-        index = i;
-
         // The last filter is always the narrowest
         if (current_filter->width < width)
         {
             break;
         }
+
+        index = i;
     }
 
     if (index < 0)