diff --git a/src/modes/FgcMode.cpp b/src/modes/FgcMode.cpp
index 93d390a4..05766fe6 100644
--- a/src/modes/FgcMode.cpp
+++ b/src/modes/FgcMode.cpp
@@ -25,13 +25,13 @@ void FgcMode::UpdateDigitalOutputs(InputState &inputs, OutputState &outputs) {
     outputs.a = inputs.x;
     outputs.b = inputs.b;
     outputs.buttonL = inputs.z;
-    outputs.buttonR = inputs.r;
+    outputs.buttonR = inputs.r || inputs.c_left;
 
     // Right hand top row
     outputs.x = inputs.l;
     outputs.y = inputs.y;
     outputs.triggerLDigital = inputs.lightshield;
-    outputs.triggerRDigital = inputs.midshield || inputs.c_left;
+    outputs.triggerRDigital = inputs.midshield;
 
     // Menu keys
     outputs.start = inputs.start;