diff --git a/src/device/kbc_at_dev.c b/src/device/kbc_at_dev.c
index a2baa21a0..87fdd51c6 100644
--- a/src/device/kbc_at_dev.c
+++ b/src/device/kbc_at_dev.c
@@ -144,7 +144,7 @@ kbc_at_dev_poll(void *priv)
                 dev->cmd_queue_start = (dev->cmd_queue_start + 1) & 0xf;
             }
             if (dev->cmd_queue_start == dev->cmd_queue_end)
-                dev->state = (dev->state == DEV_STATE_MAIN_OUT) ? DEV_STATE_MAIN_2 : DEV_STATE_MAIN_IN;
+                dev->state++;
             break;
         case DEV_STATE_MAIN_IN:
             /* Wait for host data. */
diff --git a/src/include/86box/keyboard.h b/src/include/86box/keyboard.h
index 6dec8a6db..6f7517e9d 100644
--- a/src/include/86box/keyboard.h
+++ b/src/include/86box/keyboard.h
@@ -29,9 +29,9 @@ enum {
 
 enum {
     DEV_STATE_MAIN_1 = 0,
+    DEV_STATE_MAIN_OUT,
     DEV_STATE_MAIN_2,
     DEV_STATE_MAIN_CMD,
-    DEV_STATE_MAIN_OUT,
     DEV_STATE_MAIN_WANT_IN,
     DEV_STATE_MAIN_IN
 };