diff --git a/ChangeLog b/ChangeLog
index a1c77ad0ba..2f5c0b0a75 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-25  Jihoon Kim (jihoon)
+
+	* Remove ecore_imf_context_reset, cursor update in mouse move event because it's useless.
+
+
 2013-01-24  Sung W. Park (sung_)
 
 	* Add EVAS_GL_DIRECT_MEM_OPT to enable on-demand fallback memory
diff --git a/NEWS b/NEWS
index 9699a5d090..4320fefde4 100644
--- a/NEWS
+++ b/NEWS
@@ -83,6 +83,7 @@ Improvements:
     * edje entry: remove ecore_imf_context_reset in mouse up event because it's useless.
     * rebase dns.c against upstream
     * Don't over align data if they are already aligned.
+    * edje entry: remove ecore_imf_context_reset, cursor update in mouse move event because it's useless.
 
 Fixes:
     * Fix PPC (big endian) image codec bug.
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index a76456fb0b..9732a0aef0 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -2189,9 +2189,6 @@ _edje_part_mouse_move_cb(void *data, Evas *e EINA_UNUSED, Evas_Object *obj EINA_
           {
              _edje_emit(rp->edje, "cursor,changed", rp->part->name);
              _edje_emit(rp->edje, "cursor,changed,manual", rp->part->name);
-
-             _edje_entry_imf_context_reset(rp);
-             _edje_entry_imf_cursor_info_set(en);
           }
         evas_textblock_cursor_free(tc);