diff --git a/rp2040/src/main.rs b/rp2040/src/main.rs
index 59e454e..ab449af 100644
--- a/rp2040/src/main.rs
+++ b/rp2040/src/main.rs
@@ -711,9 +711,9 @@ fn get_joystick_report(
         matrix_keys[15].usb_button_sec_pressed = sec_button_pressed;
     }
     if matrix_keys[15].usb_button_sec != 0 && matrix_keys[15].usb_button_sec_pressed {
-        hat3 = hat_l;
+        hat2 = hat_l;
     } else {
-        hat1 = hat_l;
+        hat4 = hat_l;
     }
 
     // Handle sec_button (Fn) for right hat switch
@@ -731,9 +731,9 @@ fn get_joystick_report(
         matrix_keys[20].usb_button_sec_pressed = sec_button_pressed;
     }
     if matrix_keys[20].usb_button_sec != 0 && matrix_keys[20].usb_button_sec_pressed {
-        hat4 = hat_r;
+        hat1 = hat_r;
     } else {
-        hat2 = hat_r;
+        hat3 = hat_r;
     }
 
     // Fix button state for center hat press on hat