diff --git a/src/lib/eina/eina_file_common.c b/src/lib/eina/eina_file_common.c
index 4b94d1d20c..8d7472bdd3 100644
--- a/src/lib/eina/eina_file_common.c
+++ b/src/lib/eina/eina_file_common.c
@@ -606,8 +606,8 @@ _eina_file_map_lines_iterator_next(Eina_Lines_Iterator *it, void **data)
    match = *it->current.end;
    if (it->current.index > 0)
      it->current.end++;
-   while ((*it->current.end == '\n' || *it->current.end == '\r')
-          && it->current.end < it->end)
+   while (it->current.end < it->end &&
+          (*it->current.end == '\n' || *it->current.end == '\r'))
      {
         if (match == *it->current.end)
           break;