diff --git a/common/menu.c b/common/menu.c
index e85a320..191bd64 100644
--- a/common/menu.c
+++ b/common/menu.c
@@ -252,7 +252,7 @@
 
 int menu_show(struct menu *m)
 {
-	int ch;
+	int ch, ch_previous = 0;
 	int escape = 0;
 	int countdown;
 	int auto_display_len = 16;
@@ -339,7 +339,12 @@
 				m->selected->action(m, m->selected);
 			print_menu_entry(m, m->selected, 1);
 			break;
+		case KEY_ENTER:
+			if (ch_previous == KEY_RETURN)
+				break;
 		case KEY_RETURN:
+			if (ch_previous == KEY_ENTER)
+				break;
 			clear();
 			gotoXY(1,1);
 			m->selected->action(m, m->selected);
@@ -350,6 +355,7 @@
 		default:
 			break;
 		}
+		ch_previous = ch;
 	} while(1);
 
 	return 0;