3 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index f5f6c90043..8343a48391 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 2013-09-19 Mike Blumenkrantz
 
         * Fix bug where new files could not be created repeatedly
+        * Clicking in the filemanager when renaming cancels the rename
 
 2013-08-30 Mike Blumenkrantz
 
diff --git a/NEWS b/NEWS
index 0a26fe4a6c..a2606a1a83 100644
--- a/NEWS
+++ b/NEWS
@@ -149,6 +149,7 @@ Improvements:
     * added check changed to shelf config dialog
     * udisks2 support
     * Navigate menu item now opens $HOME
+    * Clicking in the filemanager when renaming cancels the rename
 
 Fixes:
     * IBar menu didn't allow to configure different icon sources, show contents menu even on empty IBar.
diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index 8544402a8a..2a2c2db122 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -8041,6 +8041,8 @@ _e_fm2_cb_mouse_down(void *data, Evas *e __UNUSED__, Evas_Object *obj __UNUSED__
    sd = data;
    ev = event_info;
    _e_fm2_typebuf_hide(sd->obj);
+   if (sd->iop_icon)
+     _e_fm2_icon_entry_widget_del(sd->iop_icon);
    if (ev->button == 1)
      {
         Eina_List *l;