diff --git a/fs/inode/fs_inodesearch.c b/fs/inode/fs_inodesearch.c
index 7dda789359e..553c143f3b7 100644
--- a/fs/inode/fs_inodesearch.c
+++ b/fs/inode/fs_inodesearch.c
@@ -559,5 +559,16 @@ FAR const char *inode_nextname(FAR const char *name)
       name++;
     }
 
+  /* Skip single '.' path segment, but not '..' */
+
+  if (*name == '.' && *(name + 1) == '/')
+    {
+      /* If there is a '/' after '.',
+       * continue searching from the next character
+       */
+
+      name = inode_nextname(name);
+    }
+
   return name;
 }