diff --git a/src/modes/FgcMode.cpp b/src/modes/FgcMode.cpp
index f2a1e556..93d390a4 100644
--- a/src/modes/FgcMode.cpp
+++ b/src/modes/FgcMode.cpp
@@ -31,14 +31,14 @@ void FgcMode::UpdateDigitalOutputs(InputState &inputs, OutputState &outputs) {
     outputs.x = inputs.l;
     outputs.y = inputs.y;
     outputs.triggerLDigital = inputs.lightshield;
-    outputs.triggerRDigital = inputs.midshield;
+    outputs.triggerRDigital = inputs.midshield || inputs.c_left;
 
     // Menu keys
     outputs.start = inputs.start;
     outputs.select = inputs.mod_x;
     outputs.home = inputs.mod_y;
-    outputs.leftStickClick = inputs.c_left;
-    outputs.rightStickClick = inputs.c_down;
+    outputs.leftStickClick = inputs.c_down;
+    outputs.rightStickClick = inputs.c_right;
 }
 
 void FgcMode::UpdateAnalogOutputs(InputState &inputs, OutputState &outputs) {