diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index d490281249..f349eae0bb 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -289,10 +289,10 @@ static int action_ok_shader_pass(const char *path,
       const char *label, unsigned type, size_t idx, size_t entry_idx)
 {
    menu_displaylist_info_t info = {0};
-   hack_shader_pass             = type - MENU_SETTINGS_SHADER_PASS_0;
    menu_handle_t *menu          = menu_driver_get_ptr();
    menu_list_t *menu_list       = menu_list_get_ptr();
    settings_t *settings         = config_get_ptr();
+   hack_shader_pass             = type - MENU_SETTINGS_SHADER_PASS_0;
    if (!menu || !menu_list)
       return -1;
 
diff --git a/menu/cbs/menu_cbs_start.c b/menu/cbs/menu_cbs_start.c
index ae2ef579fa..2e5047bc71 100644
--- a/menu/cbs/menu_cbs_start.c
+++ b/menu/cbs/menu_cbs_start.c
@@ -127,10 +127,10 @@ static int action_start_shader_action_preset_parameter(unsigned type, const char
 static int action_start_shader_pass(unsigned type, const char *label)
 {
 #ifdef HAVE_SHADER_MANAGER
-   struct video_shader *shader = NULL;
+   struct video_shader *shader           = NULL;
    struct video_shader_pass *shader_pass = NULL;
-   hack_shader_pass = type - MENU_SETTINGS_SHADER_PASS_0;
-   menu_handle_t *menu = menu_driver_get_ptr();
+   menu_handle_t *menu                   = menu_driver_get_ptr();
+   hack_shader_pass                      = type - MENU_SETTINGS_SHADER_PASS_0;
    if (!menu)
       return -1;