=== modified file 'normal/completion.c' --- normal/completion.c 2010-06-11 20:31:16 +0000 +++ normal/completion.c 2010-07-28 17:02:42 +0000 @@ -247,7 +247,7 @@ goto fail; } - dir = grub_strchr (current_word, '/'); + dir = grub_strchr (current_word + grub_strlen(device) + 2, '/'); last_dir = grub_strrchr (current_word, '/'); if (dir) {