diff --git a/scd/app.c b/scd/app.c
index ed7adc3a3..57c4b7743 100644
--- a/scd/app.c
+++ b/scd/app.c
@@ -1706,10 +1706,12 @@ app_do_with_keygrip (ctrl_t ctrl, int action, const char *keygrip_str)
               err = a->fnc.with_keygrip (a, ctrl, action, keygrip_str);
               unlock_card (c);
               if (!err)
-                break;
+                goto leave_the_loop;
             }
         }
 
+ leave_the_loop:
+
   /* FIXME: Add app switching logic.  The above code assumes that the
    * actions can be performend without switching.  This needs to be
    * checked.  */