diff --git a/src/bin/e_fm.c b/src/bin/e_fm.c
index bbd3791c4..b992ec73c 100644
--- a/src/bin/e_fm.c
+++ b/src/bin/e_fm.c
@@ -7820,7 +7820,7 @@ _e_fm2_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object *obj, void *event
                }
           }
      }
-   else if (!strcmp(ev->key, "Return"))
+   else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
      {
         /* if selected - select callback.
          * typebuf mode: if nothing selected - run cmd
@@ -10273,7 +10273,7 @@ _e_fm2_icon_entry_widget_cb_key_down(void *data, Evas *e __UNUSED__, Evas_Object
 
    if (!strcmp(ev->key, "Escape"))
      _e_fm2_icon_entry_widget_del(ic);
-   else if (!strcmp(ev->key, "Return"))
+   else if ((!strcmp(ev->key, "Return")) || (!strcmp(ev->key, "KP_Enter")))
      _e_fm2_icon_entry_widget_accept(ic);
 }
 
diff --git a/src/modules/fileman/e_fwin.c b/src/modules/fileman/e_fwin.c
index 0f8f0c0ce..f22479958 100644
--- a/src/modules/fileman/e_fwin.c
+++ b/src/modules/fileman/e_fwin.c
@@ -2682,7 +2682,8 @@ _e_fwin_file_open_dialog_cb_key_down(void *data,
 
    if (!strcmp(ev->keyname, "Escape"))
      _e_fwin_cb_close(fwin->fad, fwin->fad->dia);
-   else if (!strcmp(ev->keyname, "Return"))
+   else if ((!strcmp(ev->keyname, "Return")) ||
+            (!strcmp(ev->keyname, "KP_Enter"))) 
      _e_fwin_cb_open(fwin->fad, fwin->fad->dia);
 }