diff --git a/src/weather/gcal-weather-service.c b/src/weather/gcal-weather-service.c
index 10d4bdde..1d09b088 100644
--- a/src/weather/gcal-weather-service.c
+++ b/src/weather/gcal-weather-service.c
@@ -309,7 +309,8 @@ get_icon_name_sortkey (const gchar *icon_name,
 
   for (i = 0; i < G_N_ELEMENTS (icons); i++)
     {
-      if (icons[i].name[normalized_name_len] == '\0' && strncmp (icon_name, icons[i].name, normalized_name_len) == 0)
+      if (normalized_name_len == strlen (icons[i].name) &&
+          strncmp (icon_name, icons[i].name, normalized_name_len) == 0)
         {
           *supports_night_icon = icons[i].night_support;
           return i;