diff --git a/menu/cbs/menu_cbs_left.c b/menu/cbs/menu_cbs_left.c
index 3085d9fb52..75026eb31a 100644
--- a/menu/cbs/menu_cbs_left.c
+++ b/menu/cbs/menu_cbs_left.c
@@ -60,33 +60,25 @@ static int generic_shader_action_parameter_left(
    return 0;
 }
 
-static int shader_action_parameter_left(unsigned type, const char *label,
-      bool wraparound)
+int shader_action_parameter_left(unsigned type, const char *label, bool wraparound)
 {
    video_shader_ctx_t shader_info;
    struct video_shader_parameter *param = NULL;
 
    video_shader_driver_get_current_shader(&shader_info);
 
-   param = &shader_info.data->parameters[type
-      - MENU_SETTINGS_SHADER_PARAMETER_0];
+   param = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
    if (!param)
-      return 0;
-   return generic_shader_action_parameter_left(param,
-         type, label, wraparound);
+      return menu_cbs_exit();
+   generic_shader_action_parameter_left(param, type, label, wraparound);
+
+   param = menu_shader_manager_get_parameters(
+         type - MENU_SETTINGS_SHADER_PARAMETER_0);
+   if (!param)
+      return menu_cbs_exit();
+   return generic_shader_action_parameter_left(param, type, label, wraparound);
 }
 
-static int shader_action_parameter_preset_left(unsigned type,
-      const char *label,
-      bool wraparound)
-{
-   struct video_shader_parameter *param = menu_shader_manager_get_parameters(
-         type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0);
-   if (!param)
-      return 0;
-   return generic_shader_action_parameter_left(param,
-         type, label, wraparound);
-}
 #endif
 
 static int action_left_cheat(unsigned type, const char *label,
@@ -614,7 +606,7 @@ static int menu_cbs_init_bind_left_compare_type(menu_file_list_cbs_t *cbs,
    else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
          && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
    {
-      BIND_ACTION_LEFT(cbs, shader_action_parameter_preset_left);
+      BIND_ACTION_LEFT(cbs, shader_action_parameter_left);
    }
 #endif
    else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
diff --git a/menu/cbs/menu_cbs_right.c b/menu/cbs/menu_cbs_right.c
index 61e53eb34c..3ef4948435 100644
--- a/menu/cbs/menu_cbs_right.c
+++ b/menu/cbs/menu_cbs_right.c
@@ -71,16 +71,12 @@ int shader_action_parameter_right(unsigned type, const char *label, bool wraparo
    video_shader_driver_get_current_shader(&shader_info);
 
    param = &shader_info.data->parameters[type - MENU_SETTINGS_SHADER_PARAMETER_0];
+
    if (!param)
       return menu_cbs_exit();
-   return generic_shader_action_parameter_right(param, type, label, wraparound);
-}
-
-int shader_action_parameter_preset_right(unsigned type, const char *label,
-      bool wraparound)
-{
-   struct video_shader_parameter *param = menu_shader_manager_get_parameters(
-         type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0);
+   generic_shader_action_parameter_right(param, type, label, wraparound);
+   param = menu_shader_manager_get_parameters(
+         type - MENU_SETTINGS_SHADER_PARAMETER_0);
    if (!param)
       return menu_cbs_exit();
    return generic_shader_action_parameter_right(param, type, label, wraparound);
@@ -481,7 +477,7 @@ static int menu_cbs_init_bind_right_compare_type(menu_file_list_cbs_t *cbs,
    else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
          && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
    {
-      BIND_ACTION_RIGHT(cbs, shader_action_parameter_preset_right);
+      BIND_ACTION_RIGHT(cbs, shader_action_parameter_right);
    }
 #endif
    else if (type >= MENU_SETTINGS_INPUT_DESC_BEGIN
diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 195a5e05bb..df21786a9e 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -132,7 +132,7 @@ static int shader_action_parameter_select(const char *path, const char *label, u
 static int shader_action_parameter_preset_select(const char *path, const char *label, unsigned type,
       size_t idx)
 {
-   return shader_action_parameter_preset_right(type, label, true);
+   return shader_action_parameter_right(type, label, true);
 }
 #endif
 
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index e573cbbbd4..dfc376bf17 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -135,12 +135,7 @@ static int action_start_shader_action_parameter(unsigned type, const char *label
 
 #endif
 
-   return 0;
-}
-
-static int action_start_shader_action_preset_parameter(unsigned type, const char *label)
-{
-   unsigned parameter = type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0;
+   unsigned parameter = type - MENU_SETTINGS_SHADER_PARAMETER_0;
    return menu_shader_manager_clear_parameter(parameter);
 }
 
@@ -337,7 +332,7 @@ static int menu_cbs_init_bind_start_compare_type(menu_file_list_cbs_t *cbs,
    else if (type >= MENU_SETTINGS_SHADER_PRESET_PARAMETER_0
          && type <= MENU_SETTINGS_SHADER_PRESET_PARAMETER_LAST)
    {
-      BIND_ACTION_START(cbs, action_start_shader_action_preset_parameter);
+      BIND_ACTION_START(cbs, action_start_shader_action_parameter);
    }
    else if (type >= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_BEGIN &&
          type <= MENU_SETTINGS_LIBRETRO_PERF_COUNTERS_END)
diff --git a/menu/menu_cbs.h b/menu/menu_cbs.h
index 11065bbfd9..c8fe8d53c2 100644
--- a/menu/menu_cbs.h
+++ b/menu/menu_cbs.h
@@ -141,9 +141,6 @@ int action_refresh_default(file_list_t *list, file_list_t *menu_list);
 
 int shader_action_parameter_right(unsigned type, const char *label, bool wraparound);
 
-int shader_action_parameter_preset_right(unsigned type, const char *label,
-      bool wraparound);
-
 int generic_action_ok_displaylist_push(const char *path, const char *new_path,
       const char *label, unsigned type, size_t idx, size_t entry_idx,
       unsigned action_type);
diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c
index dd5f68718b..d0ed8c9c3b 100644
--- a/menu/menu_displaylist.c
+++ b/menu/menu_displaylist.c
@@ -1397,11 +1397,6 @@ static int menu_displaylist_parse_shader_options(menu_displaylist_info_t *info)
          msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS),
          MENU_ENUM_LABEL_VIDEO_SHADER_PARAMETERS,
          MENU_SETTING_ACTION, 0, 0);
-   menu_entries_append_enum(info->list,
-         msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_PRESET_PARAMETERS),
-         msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS),
-         MENU_ENUM_LABEL_VIDEO_SHADER_PRESET_PARAMETERS,
-         MENU_SETTING_ACTION, 0, 0);
    menu_entries_append_enum(info->list,
          msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SHADER_NUM_PASSES),
          msg_hash_to_str(MENU_ENUM_LABEL_VIDEO_SHADER_NUM_PASSES),