diff --git a/legacy/elementary/src/lib/elm_entry.c b/legacy/elementary/src/lib/elm_entry.c
index d8cec5dc7b..89e46a140e 100644
--- a/legacy/elementary/src/lib/elm_entry.c
+++ b/legacy/elementary/src/lib/elm_entry.c
@@ -323,6 +323,7 @@ _text_to_mkup(const char *text)
    
    for (;;)
      {
+        // FIXME: use evas_string_char_next_get()
         ch = evas_common_font_utf8_get_next((unsigned char *)(text), &pos);
         if (ch <= 0) break;
         if (ch == '\n') str = _str_append(str, "<br>", &str_len, &str_alloc);
@@ -333,6 +334,7 @@ _text_to_mkup(const char *text)
              char tstr[16];
              
              pos2 = pos;
+             // FIXME: use evas_string_char_next_get()
              ch = evas_common_font_utf8_get_next((unsigned char *)(text), &pos2);
              strncpy(tstr, text + pos, pos2 - pos);
              tstr[pos2 - pos] = 0;
diff --git a/legacy/elementary/src/lib/elm_hover.c b/legacy/elementary/src/lib/elm_hover.c
index 08195c1f98..406014f900 100644
--- a/legacy/elementary/src/lib/elm_hover.c
+++ b/legacy/elementary/src/lib/elm_hover.c
@@ -37,6 +37,8 @@ static void
 _del_pre_hook(Evas_Object *obj)
 {
    Widget_Data *wd = elm_widget_data_get(obj);
+   if (evas_object_visible_get(obj))
+     evas_object_smart_callback_call(obj, "clicked", NULL);
    elm_hover_target_set(obj, NULL);
    elm_hover_parent_set(obj, NULL);
    evas_object_event_callback_del(wd->hov, EVAS_CALLBACK_MOVE, _hov_move);