diff --git a/menu/cbs/menu_cbs_select.c b/menu/cbs/menu_cbs_select.c
index 70436fc105..84132b7a01 100644
--- a/menu/cbs/menu_cbs_select.c
+++ b/menu/cbs/menu_cbs_select.c
@@ -42,7 +42,9 @@ static int action_select_default(const char *path, const char *label, unsigned t
    menu_entry_init(&entry);
    menu_entry_get(&entry, 0, idx, NULL, false);
 
-   cbs = selection_buf ? (menu_file_list_cbs_t*)file_list_get_actiondata_at_offset(selection_buf, idx) : NULL;
+   if (selection_buf)
+      cbs                     = (menu_file_list_cbs_t*)
+         file_list_get_actiondata_at_offset(selection_buf, idx);
 
    if (!cbs)
    {
@@ -76,7 +78,7 @@ static int action_select_default(const char *path, const char *label, unsigned t
    if (action == MENU_ACTION_NOOP)
    {
        if (cbs->action_ok)
-           action = MENU_ACTION_OK;
+           action     = MENU_ACTION_OK;
        else
        {
            if (cbs->action_start)