diff --git a/input.cpp b/input.cpp
index 0fcbcdf..91cf027 100644
--- a/input.cpp
+++ b/input.cpp
@@ -1811,7 +1811,7 @@ static void input_cb(struct input_event *ev, struct input_absinfo *absinfo, int
 	if (!input[dev].num)
 	{
 		int assign_btn = ((input[dev].quirk == QUIRK_PDSP || input[dev].quirk == QUIRK_MSSP) && ev->type == EV_REL);
-		if (!assign_btn && ev->type == EV_KEY && ev->value >= 1)
+		if (!assign_btn && ev->type == EV_KEY && ev->value >= 1 && ev->code >= 256)
 		{
 			for (int i = SYS_BTN_RIGHT; i <= SYS_BTN_START; i++) if (ev->code == input[dev].mmap[i]) assign_btn = 1;
 		}
diff --git a/user_io.cpp b/user_io.cpp
index fe6e74f..adde39f 100644
--- a/user_io.cpp
+++ b/user_io.cpp
@@ -1966,7 +1966,7 @@ int user_io_file_tx(const char* name, unsigned char index, char opensave, char m
 	int progress = -1;
 	if (use_progress) MenuHide();
 
-	
+
 	if (is_gba())
 	{
 		process_ss(name);
@@ -2538,7 +2538,7 @@ void user_io_poll()
 		}
 	}
 
-	if (core_type == CORE_TYPE_8BIT && !is_menu() && !is_minimig() && !is_archie())
+	if (core_type == CORE_TYPE_8BIT && !is_minimig() && !is_archie())
 	{
 		// frequently check ps2 mouse for events
 		if (CheckTimer(mouse_timer))