diff --git a/legacy/edje/ChangeLog b/legacy/edje/ChangeLog
index 2cf7dc9251..689b3e7dad 100644
--- a/legacy/edje/ChangeLog
+++ b/legacy/edje/ChangeLog
@@ -712,3 +712,7 @@
 2012-12-18  Jihoon Kim
 
 	* ecore_imf cursor infomation update is not necessary in focus-out event
+
+2012-12-18  WooHyun Jung
+
+	* Before cursor is moved by mouse_down, imf_context_reset should be called with current cursor position.
diff --git a/legacy/edje/NEWS b/legacy/edje/NEWS
index 46ac1b57fe..6848d3a8cc 100644
--- a/legacy/edje/NEWS
+++ b/legacy/edje/NEWS
@@ -35,6 +35,7 @@ Fixes:
     * fix build on Solaris 11.
     * fix duplicate after programs in group inheritance.
     * fix return plain string in retrive surrounding text callback of entry
+    * Before cursor is moved by mouse_down, imf_context_reset should be called with current cursor position.
 
 Edje 1.7.0
 
diff --git a/legacy/edje/src/lib/edje_entry.c b/legacy/edje/src/lib/edje_entry.c
index 14564e18c3..0d067ab91f 100644
--- a/legacy/edje/src/lib/edje_entry.c
+++ b/legacy/edje/src/lib/edje_entry.c
@@ -1780,6 +1780,8 @@ _edje_part_mouse_down_cb(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUS
      }
 #endif
 
+   _edje_entry_imf_context_reset(rp);
+
    shift = evas_key_modifier_is_set(ev->modifiers, "Shift");
    en->select_mod_start = EINA_FALSE;
    en->select_mod_end = EINA_FALSE;