diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index 70b8cabb44..c324d1a536 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -82,17 +82,12 @@ utf8_offset_to_characters(const char *str, int offset)
 {
    int index = 0;
    unsigned int i = 0;
-   int len = 0;
-
-   if (!str) return 0;
-
-   len = strlen(str);
-
-   if (offset > len)
-     offset = len;
 
    for (; index < offset; i++)
-     eina_unicode_utf8_next_get(str, &index);
+     {
+        if (eina_unicode_utf8_next_get(str, &index) == 0)
+          break;
+     }
 
    return i;
 }