diff --git a/src/com/limelight/binding/input/ControllerHandler.java b/src/com/limelight/binding/input/ControllerHandler.java
index 664f1a95..5d59fb83 100644
--- a/src/com/limelight/binding/input/ControllerHandler.java
+++ b/src/com/limelight/binding/input/ControllerHandler.java
@@ -240,6 +240,12 @@ public class ControllerHandler {
 		case KeyEvent.KEYCODE_BUTTON_THUMBR:
 			inputMap &= ~ControllerPacket.RS_CLK_FLAG;
 			break;
+		case KeyEvent.KEYCODE_BUTTON_L2:
+			leftTrigger = 0;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_R2:
+			rightTrigger = 0;
+			break;
 		default:
 			return false;
 		}
@@ -315,6 +321,12 @@ public class ControllerHandler {
 		case KeyEvent.KEYCODE_BUTTON_THUMBR:
 			inputMap |= ControllerPacket.RS_CLK_FLAG;
 			break;
+		case KeyEvent.KEYCODE_BUTTON_L2:
+			leftTrigger = (byte)0xFF;
+			break;
+		case KeyEvent.KEYCODE_BUTTON_R2:
+			rightTrigger = (byte)0xFF;
+			break;
 		default:
 			return false;
 		}