diff --git a/hw/xfree86/os-support/shared/at_scancode.c b/hw/xfree86/os-support/shared/at_scancode.c
index 821e116ab..0b9bc674c 100644
--- a/hw/xfree86/os-support/shared/at_scancode.c
+++ b/hw/xfree86/os-support/shared/at_scancode.c
@@ -43,6 +43,9 @@ ATScancode(InputInfoPtr pInfo, int *scanCode)
              case KEY_Prefix1:
                   pKbd->scanPrefix = *scanCode;  /* special prefixes */
                   return TRUE;
+          }
+          if (!xf86IsPc98()) {
+            switch (*scanCode) {
              case 0x59: *scanCode = KEY_0x59; break;
              case 0x5a: *scanCode = KEY_0x5A; break;
              case 0x5b: *scanCode = KEY_0x5B; break;
@@ -71,6 +74,7 @@ ATScancode(InputInfoPtr pInfo, int *scanCode)
              case 0x74: *scanCode = KEY_0x74; break;
              case 0x75: *scanCode = KEY_0x75; break;
              case 0x76: *scanCode = KEY_0x76; break;
+            }
           }
           break;
        case KEY_Prefix0: