diff --git a/apps/keymaps/keymap-x5.c b/apps/keymaps/keymap-x5.c
index 4b5b74dced..0bc4833077 100644
--- a/apps/keymaps/keymap-x5.c
+++ b/apps/keymaps/keymap-x5.c
@@ -75,9 +75,9 @@ const struct button_mapping remote_button_context_standard[]  = {
 
 /** Bookmark Screen **/
 const struct button_mapping button_context_bmark[]  = {
-    { ACTION_BMS_DELETE,       BUTTON_REC|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_BMS_DELETE,       BUTTON_REC|BUTTON_REPEAT, BUTTON_REC },
     { ACTION_BMS_SELECT,       BUTTON_SELECT,            BUTTON_NONE },
-    { ACTION_BMS_EXIT,         BUTTON_REC|BUTTON_REL,    BUTTON_NONE },
+    { ACTION_BMS_EXIT,         BUTTON_REC|BUTTON_REL,    BUTTON_REC },
 
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_CUSTOM|CONTEXT_SETTINGS),
 }; /* button_context_settings_bmark */
diff --git a/docs/CREDITS b/docs/CREDITS
index b673e44a3f..38e608655a 100644
--- a/docs/CREDITS
+++ b/docs/CREDITS
@@ -251,3 +251,4 @@ Ian Webber
 Pavel Gnelitsa
 Lutz Böhne
 Will Robertson
+Stephane Doyon