diff --git a/FCL/src/main/java/com/tungsten/fcl/control/view/ControlButton.java b/FCL/src/main/java/com/tungsten/fcl/control/view/ControlButton.java
index 4d128f57..169b871a 100644
--- a/FCL/src/main/java/com/tungsten/fcl/control/view/ControlButton.java
+++ b/FCL/src/main/java/com/tungsten/fcl/control/view/ControlButton.java
@@ -482,10 +482,10 @@ public class ControlButton extends AppCompatButton implements CustomView {
     private boolean keycodeOutputting = false;
 
     private void handleKeyEvent(ButtonEventData.Event event, boolean press) {
+        if (!press && !keycodeOutputting) {
+            return;
+        }
         for (int keycode : event.outputKeycodesList()) {
-            if (!press && !keycodeOutputting) {
-                continue;
-            }
             keycodeOutputting = press;
             menu.getInput().sendKeyEvent(keycode, press);
         }