Index: src/hid_cfg_input.c
===================================================================
--- src/hid_cfg_input.c	(revision 1605)
+++ src/hid_cfg_input.c	(revision 1606)
@@ -208,11 +208,6 @@
 
 const hid_cfg_keytrans_t hid_cfg_key_default_trans[] = {
 	{ "semicolon", ';'  },
-	{ "return",    '\r' },
-	{ "enter",     '\r' },
-	{ "space",     ' '  },
-/*	{ "backspace", '\b' },*/
-/*	{ "tab",       '\t' },*/
 	{ NULL,        0    },
 };
 
Index: src_plugins/hid_gtk/gui-top-window.c
===================================================================
--- src_plugins/hid_gtk/gui-top-window.c	(revision 1605)
+++ src_plugins/hid_gtk/gui-top-window.c	(revision 1606)
@@ -1491,7 +1491,11 @@
 
 static unsigned short int ghid_translate_key(char *desc, int len)
 {
-	guint key = gdk_keyval_from_name(desc);
+	guint key;
+
+	if (strcasecmp(desc, "enter") == 0) desc = "Return";
+
+	key = gdk_keyval_from_name(desc);
 	if (key > 0xffff) {
 		Message("Ignoring invalid/exotic key sym: '%s'\n", desc);
 		return 0;