diff --git a/apps/keymaps/keymap-clip.c b/apps/keymaps/keymap-clip.c
index 4d080f9f0a..6bd22b2d38 100644
--- a/apps/keymaps/keymap-clip.c
+++ b/apps/keymaps/keymap-clip.c
@@ -91,10 +91,10 @@ static const struct button_mapping button_context_wps[]  = {
 
 static const struct button_mapping button_context_settings[] = {
     { ACTION_STD_CANCEL,        BUTTON_POWER,                     BUTTON_NONE },
-    { ACTION_SETTINGS_INC,      BUTTON_RIGHT,               BUTTON_NONE },
-    { ACTION_SETTINGS_INCREPEAT,BUTTON_RIGHT|BUTTON_REPEAT, BUTTON_NONE },
-    { ACTION_SETTINGS_DEC,      BUTTON_LEFT,                 BUTTON_NONE },
-    { ACTION_SETTINGS_DECREPEAT,BUTTON_LEFT|BUTTON_REPEAT,   BUTTON_NONE },
+    { ACTION_SETTINGS_INC,      BUTTON_UP,               BUTTON_NONE },
+    { ACTION_SETTINGS_INCREPEAT,BUTTON_UP|BUTTON_REPEAT, BUTTON_NONE },
+    { ACTION_SETTINGS_DEC,      BUTTON_DOWN,                 BUTTON_NONE },
+    { ACTION_SETTINGS_DECREPEAT,BUTTON_DOWN|BUTTON_REPEAT,   BUTTON_NONE },
 
     { ACTION_STD_PREV,          BUTTON_LEFT,                      BUTTON_NONE },
     { ACTION_STD_PREVREPEAT,    BUTTON_LEFT|BUTTON_REPEAT,        BUTTON_NONE },
@@ -183,15 +183,6 @@ static const struct button_mapping button_context_settings_right_is_inc[]  = {
     LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_STD),
 }; /* button_context_settings_right_is_inc */
 
-static const struct button_mapping button_context_settings_time[] = {
-    { ACTION_STD_PREV,        BUTTON_UP|BUTTON_REL,             BUTTON_NONE },
-    { ACTION_STD_PREVREPEAT,  BUTTON_UP|BUTTON_REPEAT,          BUTTON_NONE },
-    { ACTION_STD_NEXT,        BUTTON_DOWN|BUTTON_REL,           BUTTON_NONE },
-    { ACTION_STD_NEXTREPEAT,  BUTTON_DOWN|BUTTON_REPEAT,        BUTTON_NONE },
-
-    LAST_ITEM_IN_LIST__NEXTLIST(CONTEXT_SETTINGS)
-}; /* button_context_settings_time */
-
 static const struct button_mapping button_context_pitchscreen[]  = {
     { ACTION_PS_INC_SMALL,      BUTTON_RIGHT,                 BUTTON_NONE },
     { ACTION_PS_INC_BIG,        BUTTON_RIGHT|BUTTON_REPEAT,   BUTTON_NONE },
@@ -292,6 +283,7 @@ const struct button_mapping* get_context_mapping(int context)
             return button_context_tree;
 
         case CONTEXT_SETTINGS:
+        case CONTEXT_SETTINGS_TIME:
             return button_context_settings;
         case CONTEXT_CUSTOM|CONTEXT_SETTINGS:
         case CONTEXT_SETTINGS_COLOURCHOOSER:
@@ -299,9 +291,6 @@ const struct button_mapping* get_context_mapping(int context)
         case CONTEXT_SETTINGS_RECTRIGGER:
             return button_context_settings_right_is_inc;
 
-        case CONTEXT_SETTINGS_TIME:
-            return button_context_settings_time;
-
         case CONTEXT_YESNOSCREEN:
             return button_context_yesno;
         case CONTEXT_FM: