diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index b1a516a21..f893afc4a 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -1891,6 +1891,11 @@ _evry_input_complete(Evry_State *s)
      {
         strncpy(s->input, input, INPUTLEN - 1);
         _evry_update_text_label(s);
+        if (CUR_SEL->update_timer)
+          {
+             ecore_timer_del(CUR_SEL->update_timer);
+             CUR_SEL->update_timer = NULL;
+          }
         _evry_cb_update_timer(CUR_SEL);
         evry_item_select(s, it);
      }
diff --git a/src/modules/everything/evry_util.c b/src/modules/everything/evry_util.c
index cfc8f9db4..057b4ff00 100644
--- a/src/modules/everything/evry_util.c
+++ b/src/modules/everything/evry_util.c
@@ -191,7 +191,10 @@ evry_fuzzy_match(const char *str, const char *match)
                   ii = 0;
                   /* go to next match */
                   for (; (m[0] && m[ii]) && !isspace(*m); m += ii)
-                    if (!_evry_utf8_next(m, &ii)) break;
+                    {
+                       ii = 0;
+                       if (!_evry_utf8_next(m, &ii)) break;
+                    }
                }
 
              if (m_cnt < m_num - 1)
@@ -199,7 +202,10 @@ evry_fuzzy_match(const char *str, const char *match)
                   ii = 0;
                   /* test next match */
                   for (; (m[0] && m[ii]) && !isspace(*m); m += ii)
-                    if (!_evry_utf8_next(m, &ii)) break;
+                    {
+                       ii = 0;
+                       if (!_evry_utf8_next(m, &ii)) break;
+                    }
                   m_cnt++;
                   break;
                }