diff --git a/boards/shields/numpad3d/numpad3d.keymap b/boards/shields/numpad3d/numpad3d.keymap
index 4fc498b..cb95aad 100644
--- a/boards/shields/numpad3d/numpad3d.keymap
+++ b/boards/shields/numpad3d/numpad3d.keymap
@@ -10,12 +10,12 @@
 
         default_layer {
             bindings = <
-                &kp ESC    &kp F1      &kp F2      &kp F3
-                &kp KP_NUMLOCK &kp KP_DIVIDE  &kp KP_MULTIPLY &kp KP_MINUS
-                &kp KP_N7  &kp KP_N8   &kp KP_N9   &kp KP_ENTER
-                &kp KP_N4  &kp KP_N5   &kp KP_N6   &trans
-                &kp KP_N1  &kp KP_N2   &kp KP_N3   &kp KP_PLUS
-                &kp KP_N0  &kp KP_DOT  &trans      &trans
+                &kp ESC          &kp F1          &kp F2          &kp F3
+                &kp KP_NUMLOCK   &kp KP_DIVIDE   &kp KP_MULTIPLY &kp KP_MINUS
+                &kp KP_N7        &kp KP_N8       &kp KP_N9       &kp KP_ENTER
+                &kp KP_N4        &kp KP_N5       &kp KP_N6
+                &kp KP_N1        &kp KP_N2       &kp KP_N3       &kp KP_PLUS
+                &kp KP_N0        &kp KP_DOT
             >;
         };
     };
diff --git a/boards/shields/numpad3d/numpad3d.overlay b/boards/shields/numpad3d/numpad3d.overlay
index 3d3e275..b0ef089 100644
--- a/boards/shields/numpad3d/numpad3d.overlay
+++ b/boards/shields/numpad3d/numpad3d.overlay
@@ -14,23 +14,22 @@
 
     kscan0: kscan {
         compatible = "zmk,kscan-gpio-matrix";
-
         diode-direction = "col2row";
 
         col-gpios = <
-            &gpio1 4 GPIO_ACTIVE_HIGH
-            &gpio1 6 GPIO_ACTIVE_HIGH
-            &gpio0 9 GPIO_ACTIVE_HIGH
+            &gpio1 4  GPIO_ACTIVE_HIGH
+            &gpio1 6  GPIO_ACTIVE_HIGH
+            &gpio0 9  GPIO_ACTIVE_HIGH
             &gpio0 10 GPIO_ACTIVE_HIGH
         >;
 
         row-gpios = <
-            &gpio0 31 GPIO_OPEN_SOURCE
-            &gpio0 29 GPIO_OPEN_SOURCE
-            &gpio0 2  GPIO_OPEN_SOURCE
-            &gpio1 15 GPIO_OPEN_SOURCE
-            &gpio1 13 GPIO_OPEN_SOURCE
-            &gpio1 11 GPIO_OPEN_SOURCE
+            &gpio0 31 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)
+            &gpio0 29 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)
+            &gpio0 2  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)
+            &gpio1 15 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)
+            &gpio1 13 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)
+            &gpio1 11 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)
         >;
     };
 
@@ -43,9 +42,9 @@
             RC(0,0) RC(0,1) RC(0,2) RC(0,3)
             RC(1,0) RC(1,1) RC(1,2) RC(1,3)
             RC(2,0) RC(2,1) RC(2,2) RC(2,3)
-            RC(3,0) RC(3,1) RC(3,2) RC(3,3)
+            RC(3,0) RC(3,1) RC(3,2)
             RC(4,0) RC(4,1) RC(4,2) RC(4,3)
-            RC(5,0) RC(5,1) RC(5,2) RC(5,3)
+            RC(5,0) RC(5,1)
         >;
     };
 };