diff --git a/main/adapter/wired/npiso.c b/main/adapter/wired/npiso.c
index 2deef1c4..8dd653c5 100644
--- a/main/adapter/wired/npiso.c
+++ b/main/adapter/wired/npiso.c
@@ -175,7 +175,7 @@ static const struct npiso_kb_key_to_matrix npiso_kb_key_to_matrix[KBM_MAX] = {
  /* KB_F1, KB_F2, KB_F3, KB_F4, KB_F5, KB_F6, KB_F7, KB_F8 */
     {7, 0, P2_D1_MASK}, {6, 0, P2_D1_MASK}, {5, 0, P2_D1_MASK}, {4, 0, P2_D1_MASK}, {3, 0, P2_D1_MASK}, {2, 0, P2_D1_MASK}, {1, 0, P2_D1_MASK}, {0, 0, P2_D1_MASK},
  /* KB_F9, KB_F10, KB_F11, KB_F12, KB_PSCREEN, KB_SCROLL, KB_PAUSE, KB_INSERT */
-    {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {8, 1, P2_D4_MASK},
+    {0, 0, P2_D1_MASK | P2_D2_MASK | P2_D3_MASK | P2_D4_MASK}, {0, 1, P2_D1_MASK | P2_D2_MASK | P2_D3_MASK | P2_D4_MASK}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {8, 1, P2_D4_MASK},
  /* KB_HOME, KB_PAGEUP, KB_DEL, KB_END, KB_PAGEDOWN, KB_NUMLOCK, KB_KP_DIV, KB_KP_MULTI */
     {8, 0, P2_D1_MASK}, {0, 0, 0}, {8, 1, P2_D3_MASK}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0}, {0, 0, 0},
 
diff --git a/main/wired/npiso_io.c b/main/wired/npiso_io.c
index 03d2b173..a1a6666c 100644
--- a/main/wired/npiso_io.c
+++ b/main/wired/npiso_io.c
@@ -720,6 +720,11 @@ void npiso_init(uint32_t package)
             gpio_mask[1][NPISO_D0] = P2_D1_MASK;
         }
     }
+    else {
+        if (dev_type[0] == DEV_FC_KB) {
+            gpio_mask[0][NPISO_D0] |= P1_D1_MASK;
+        }
+    }
 
     if (dev_type[1] == DEV_SFC_SNES_MULTITAP) {
         intexc_alloc_iram(ETS_GPIO_INTR_SOURCE, 19, npiso_sfc_snes_5p_isr);