diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index 415c941208..2c1fe31285 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -142,40 +142,20 @@ static int action_start_shader_action_parameter(unsigned type, const char *label
 static int action_start_shader_action_preset_parameter(unsigned type, const char *label)
 {
 #ifdef HAVE_SHADER_MANAGER
-   struct video_shader *shader          = NULL;
-   struct video_shader_parameter *param = NULL;
-
-   menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
-         &shader);
-
-   if (!shader)
-      return 0;
-
-   param = &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0];
-   param->current = param->initial;
-   param->current = MIN(MAX(param->minimum, param->current), param->maximum);
-#endif
-
+   unsigned parameter = type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0;
+   return menu_shader_manager_clear_parameter(parameter);
+#else
    return 0;
+#endif
 }
 
 static int action_start_shader_pass(unsigned type, const char *label)
 {
 #ifdef HAVE_SHADER_MANAGER
-   struct video_shader *shader           = NULL;
-   struct video_shader_pass *shader_pass = NULL;
    hack_shader_pass                      = type - MENU_SETTINGS_SHADER_PASS_0;
 
-   menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
-         &shader);
-
-   if (shader)
-      shader_pass = &shader->pass[hack_shader_pass];
-
-   if (shader_pass)
-      *shader_pass->source.path = '\0';
+   menu_shader_manager_clear_pass_path(hack_shader_pass);
 #endif
-
    return 0;
 }
 
@@ -183,21 +163,9 @@ static int action_start_shader_pass(unsigned type, const char *label)
 static int action_start_shader_scale_pass(unsigned type, const char *label)
 {
 #ifdef HAVE_SHADER_MANAGER
-   struct video_shader *shader           = NULL;
-   struct video_shader_pass *shader_pass = NULL;
    unsigned pass                         = type - MENU_SETTINGS_SHADER_PASS_SCALE_0;
 
-   menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
-         &shader);
-
-   if (shader)
-      shader_pass = &shader->pass[pass];
-
-   if (shader_pass)
-   {
-      shader_pass->fbo.scale_x = shader_pass->fbo.scale_y = 0;
-      shader_pass->fbo.valid = false;
-   }
+   menu_shader_manager_clear_pass_scale(pass);
 #endif
 
    return 0;
@@ -207,19 +175,7 @@ static int action_start_shader_filter_pass(unsigned type, const char *label)
 {
 #ifdef HAVE_SHADER_MANAGER
    unsigned pass                         = type - MENU_SETTINGS_SHADER_PASS_FILTER_0;
-   struct video_shader *shader           = NULL;
-   struct video_shader_pass *shader_pass = NULL;
-
-   menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
-         &shader);
-
-   if (!shader)
-      return -1;
-   shader_pass = &shader->pass[pass];
-   if (!shader_pass)
-      return -1;
-
-   shader_pass->filter = RARCH_FILTER_UNSPEC;
+   return menu_shader_manager_clear_pass_filter(pass);
 #endif
 
    return 0;
diff --git a/menu/menu_shader.c b/menu/menu_shader.c
index 515d712f4b..9e8e03535e 100644
--- a/menu/menu_shader.c
+++ b/menu/menu_shader.c
@@ -361,6 +361,85 @@ bool menu_shader_manager_save_preset(
    return false;
 }
 
+int menu_shader_manager_clear_parameter(unsigned i)
+{
+   struct video_shader *shader          = NULL;
+   struct video_shader_parameter *param = NULL;
+
+   menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
+         &shader);
+
+   if (!shader)
+      return 0;
+
+   param          = &shader->parameters[i];
+   param->current = param->initial;
+   param->current = MIN(MAX(param->minimum, param->current), param->maximum);
+
+   return 0;
+}
+
+int menu_shader_manager_clear_pass_filter(unsigned i)
+{
+#ifdef HAVE_SHADER_MANAGER
+   struct video_shader *shader           = NULL;
+   struct video_shader_pass *shader_pass = NULL;
+
+   menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
+         &shader);
+
+   if (!shader)
+      return -1;
+   shader_pass = &shader->pass[i];
+   if (!shader_pass)
+      return -1;
+
+   shader_pass->filter = RARCH_FILTER_UNSPEC;
+
+   return 0;
+#else
+   return -1;
+#endif
+}
+
+void menu_shader_manager_clear_pass_scale(unsigned i)
+{
+#ifdef HAVE_SHADER_MANAGER
+   struct video_shader *shader           = NULL;
+   struct video_shader_pass *shader_pass = NULL;
+
+   menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
+         &shader);
+
+   if (shader)
+      shader_pass = &shader->pass[i];
+
+   if (shader_pass)
+   {
+      shader_pass->fbo.scale_x = 0;
+      shader_pass->fbo.scale_y = 0;
+      shader_pass->fbo.valid   = false;
+   }
+#endif
+}
+
+void menu_shader_manager_clear_pass_path(unsigned i)
+{
+#ifdef HAVE_SHADER_MANAGER
+   struct video_shader *shader           = NULL;
+   struct video_shader_pass *shader_pass = NULL;
+
+   menu_driver_ctl(RARCH_MENU_CTL_SHADER_GET,
+         &shader);
+
+   if (shader)
+      shader_pass = &shader->pass[i];
+
+   if (shader_pass)
+      *shader_pass->source.path = '\0';
+#endif
+}
+
 /**
  * menu_shader_manager_get_type:
  * @shader                   : shader handle     
diff --git a/menu/menu_shader.h b/menu/menu_shader.h
index 0b61c27da6..0e30b5aeb4 100644
--- a/menu/menu_shader.h
+++ b/menu/menu_shader.h
@@ -66,6 +66,14 @@ unsigned menu_shader_manager_get_type(const void *data);
  **/
 void menu_shader_manager_apply_changes(void);
 
+int menu_shader_manager_clear_parameter(unsigned i);
+
+int menu_shader_manager_clear_pass_filter(unsigned i);
+
+void menu_shader_manager_clear_pass_scale(unsigned i);
+
+void menu_shader_manager_clear_pass_path(unsigned i);
+
 RETRO_END_DECLS
 
 #endif