diff --git a/src/evdev-mt-touchpad.c b/src/evdev-mt-touchpad.c
index ea9c8f1e..a6afbdac 100644
--- a/src/evdev-mt-touchpad.c
+++ b/src/evdev-mt-touchpad.c
@@ -2285,7 +2285,13 @@ tp_key_ignore_for_dwt(unsigned int keycode)
 	if (tp_key_is_modifier(keycode))
 		return false;
 
-	return keycode >= KEY_F1;
+	switch (keycode) {
+	case KEY_ESC:
+	case KEY_KPASTERISK:
+		return true;
+	default:
+		return keycode >= KEY_F1;
+	}
 }
 
 static void
diff --git a/test/test-touchpad.c b/test/test-touchpad.c
index b55d979f..c0b596a9 100644
--- a/test/test-touchpad.c
+++ b/test/test-touchpad.c
@@ -4195,6 +4195,9 @@ START_TEST(touchpad_dwt_modifier_no_dwt)
 		KEY_COMPOSE,
 		KEY_RIGHTMETA,
 		KEY_LEFTMETA,
+		KEY_ESC,
+		KEY_KPASTERISK,
+		KEY_F1,
 	};
 
 	if (!has_disable_while_typing(touchpad))