diff --git a/apps/action.c b/apps/action.c
index 44980cdd9e..3747a7521e 100644
--- a/apps/action.c
+++ b/apps/action.c
@@ -265,7 +265,7 @@ static int get_action_worker(int context, int timeout,
     last_context = context;
 #ifndef HAS_BUTTON_HOLD
     screen_has_lock = ((context & ALLOW_SOFTLOCK) == ALLOW_SOFTLOCK);
-    if (screen_has_lock && keys_locked)
+    if (is_keys_locked())
     {
         if (button == unlock_combo)
         {
diff --git a/docs/CREDITS b/docs/CREDITS
index 72fc0347af..da0340e612 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -613,6 +613,7 @@ Jean-Louis Biasini
 Lorenzo Miori
 James Hunt
 Artur Juraszek
+Wieland Hoffmann
 
 The libmad team
 The wavpack team