1 files changed, 7 insertions, 0 deletions

diff --git a/apps/action.c b/apps/action.c
index 34897b938c..74f0a3d7df 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -586,6 +586,13 @@ static inline void action_code_lookup(action_last_t *last, action_cur_t *cur)
 
     cur->is_prebutton = false;
 
+#ifdef HAVE_LOCKED_ACTIONS
+    /* This only applies to the first context, to allow locked contexts to
+     * specify a fall through to their non-locked version */
+    if (is_keys_locked())
+        context |= CONTEXT_LOCKED;
+#endif
+
     for(;;)
     {
         /* logf("context = %x",context); */