diff --git a/src/input/init.c b/src/input/init.c
index 5f2d6d3..5299c6f 100644
--- a/src/input/init.c
+++ b/src/input/init.c
@@ -9,7 +9,7 @@ input_init(void)
 {
 	struct Input input = {
 	    .keycodes = {KEY_LEFT, KEY_RIGHT, KEY_UP, KEY_DOWN, KEY_SHIFT,
-	                 KEY_MENU},
+	                 KEY_EXIT},
 	};
 	int i = KEYS_COUNT;
 	while (i-- > 0)
diff --git a/src/main.c b/src/main.c
index 6c75ea3..8ac36bc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -90,7 +90,7 @@ main(void)
 	player = player_init();
 
 	/* main game loop */
-	while (!keydown(KEY_EXIT)) {
+	while (1) {
 		/* skip render frames */
 		i = 1 + frameskip;
 		while (i-- > 0) {
@@ -243,6 +243,14 @@ main(void)
 			break;
 		}
 		dupdate();
+
+		/* return to main menu */
+		/* TODO don't hardcode this */
+		if (keydown(KEY_MENU)) {
+			gint_osmenu();
+			if (game_state == Playing)
+				game_state = GamePause;
+		}
 	}
 
 	timer_stop(timer);