diff --git a/keyboards/edc40/config.h b/keyboards/edc40/config.h
index bcb8918b1b..be6cba5138 100644
--- a/keyboards/edc40/config.h
+++ b/keyboards/edc40/config.h
@@ -25,7 +25,7 @@
 #define PRODUCT edc40
 
 #define MATRIX_ROWS 4
-#define MATRIX_COLS 12
+#define MATRIX_COLS 11
 
 /*
  * Keyboard Matrix Assignments
diff --git a/keyboards/edc40/edc40.h b/keyboards/edc40/edc40.h
index d946eadd4c..1dca7f4019 100644
--- a/keyboards/edc40/edc40.h
+++ b/keyboards/edc40/edc40.h
@@ -18,14 +18,15 @@
 #include "quantum.h"
 
 #define LAYOUT( \
-    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
-    K100,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
-    K200,    K201, K202, K203, K204, K205, K206, K207, K208,    K210, \
-    K300, K301,                      K305,                K308, K310 \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K19, K0A, \
+    K10,  K11, K12, K13, K14, K15, K16, K17, K18, K29,     K1A, \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28,        K2A, \
+    K30, K31,                      K35,                K38, K3A \
 ) \
 { \
-    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011}, \
-    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, K110}, \
-    {K200, K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, K210}, \
-    {K300, K301, KC_NO, KC_NO, KC_NO, K305, KC_NO, KC_NO, K308, KC_NO, K310} \
+    { K00, K01, K02,   K03,   K04,   K05, K06,   K07,   K08, K09,   K0A }, \
+    { K10, K11, K12,   K13,   K14,   K15, K16,   K17,   K18, K19,   K1A }, \
+    { K20, K21, K22,   K23,   K24,   K25, K26,   K27,   K28, K29,   K2A }, \
+    { K30, K31, KC_NO, KC_NO, KC_NO, K35, KC_NO, KC_NO, K38, KC_NO, K3A }, \
 }
+