diff --git a/src/machine/m_amstrad.c b/src/machine/m_amstrad.c
index 44904c0c8..48a97ad41 100644
--- a/src/machine/m_amstrad.c
+++ b/src/machine/m_amstrad.c
@@ -2499,7 +2499,7 @@ machine_amstrad_init(const machine_t *model, int type)
     keyboard_set_table(scancode_xt);
     keyboard_send = kbd_adddata_ex;
     keyboard_scan = 1;
-    keyboard_set_is_amstrad(1);
+    keyboard_set_is_amstrad(((type == AMS_PC1512) || (type == AMS_PC1640)) ? 0 : 1);
 
     io_sethandler(0x0078, 2,
 		  ms_read, NULL, NULL, ms_write, NULL, NULL, ams);