diff --git a/HandheldCompanion/Managers/LayoutManager.cs b/HandheldCompanion/Managers/LayoutManager.cs
index ee31a45ef..267c8cb67 100644
--- a/HandheldCompanion/Managers/LayoutManager.cs
+++ b/HandheldCompanion/Managers/LayoutManager.cs
@@ -375,7 +375,7 @@ public static ControllerState MapController(ControllerState controllerState)
                         if (action.actionState == ActionState.Aborted)
                         {
                             int idx = sortedActions.IndexOf(action);
-                            if (idx < sortedActions.Count)
+                            if (idx < sortedActions.Count - 1)
                             {
                                 IActions nAction = sortedActions[idx + 1]; // next action
                                 if (nAction.Interruptable)