diff --git a/apps/keymaps/keymap-h1x0_h3x0.c b/apps/keymaps/keymap-h1x0_h3x0.c
index ff87bff7d3..9eebdf25c1 100644
--- a/apps/keymaps/keymap-h1x0_h3x0.c
+++ b/apps/keymaps/keymap-h1x0_h3x0.c
@@ -251,7 +251,7 @@ const struct button_mapping button_context_standard_h100remote[]  = {
     { ACTION_STD_OK,            BUTTON_RC_ON,                   BUTTON_NONE },
     { ACTION_STD_OK,            BUTTON_RC_MENU|BUTTON_REL,      BUTTON_RC_MENU },
     
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+    LAST_ITEM_IN_LIST
 }; /* button_context_standard_h100lcdremote */
 
 const struct button_mapping button_context_standard_h300lcdremote[]  = {
@@ -268,7 +268,7 @@ const struct button_mapping button_context_standard_h300lcdremote[]  = {
     { ACTION_STD_OK,            BUTTON_RC_MENU|BUTTON_REL,          BUTTON_RC_MENU },
     { ACTION_STD_OK,            BUTTON_RC_FF,                       BUTTON_NONE },
     
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+    LAST_ITEM_IN_LIST
 
 };
 
diff --git a/apps/keymaps/keymap-player.c b/apps/keymaps/keymap-player.c
index a3165b2498..7fadf931d4 100644
--- a/apps/keymaps/keymap-player.c
+++ b/apps/keymaps/keymap-player.c
@@ -94,7 +94,7 @@ static const struct button_mapping remote_button_context_standard[]  = {
     { ACTION_STD_CANCEL,    BUTTON_RC_STOP,     BUTTON_NONE },
     { ACTION_STD_OK,        BUTTON_RC_PLAY,     BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+    LAST_ITEM_IN_LIST
 };
 
 static const struct button_mapping remote_button_context_wps[]  = {
diff --git a/apps/keymaps/keymap-recorder.c b/apps/keymaps/keymap-recorder.c
index 6fe59a819d..01a6a0df11 100644
--- a/apps/keymaps/keymap-recorder.c
+++ b/apps/keymaps/keymap-recorder.c
@@ -171,7 +171,7 @@ static const struct button_mapping remote_button_context_standard[]  = {
     { ACTION_STD_CANCEL,    BUTTON_RC_STOP,     BUTTON_NONE },
     { ACTION_STD_OK,        BUTTON_RC_PLAY,     BUTTON_NONE },
 
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD)
+    LAST_ITEM_IN_LIST
 };
 
 static const struct button_mapping remote_button_context_wps[]  = {