diff --git a/gfx/drivers_shader/shader_glsl.c b/gfx/drivers_shader/shader_glsl.c
index de76111e0f..ebc4c6a107 100644
--- a/gfx/drivers_shader/shader_glsl.c
+++ b/gfx/drivers_shader/shader_glsl.c
@@ -1443,10 +1443,10 @@ static bool gl_glsl_set_coords(void *shader_data,
       elems        *= coords->vertices * sizeof(GLfloat);
 
       buffer        = (GLfloat*)malloc(elems);
-   }
 
-   if (!buffer)
-      return false;
+      if (!buffer)
+         return false;
+   }
 
    if (uni->tex_coord >= 0)
    {
diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c
index e71a52bd4e..0951f43144 100644
--- a/menu/drivers/ozone/ozone_entries.c
+++ b/menu/drivers/ozone/ozone_entries.c
@@ -574,8 +574,6 @@ border_iterate:
       menu_entry_init(&entry);
       entry.path_enabled  = false;
       entry.label_enabled = false;
-      menu_entry_get(&entry, 0, (unsigned)i, selection_buf, true);
-      menu_entry_get_value(&entry, &entry_value);
 
       if (!node)
          continue;
@@ -585,6 +583,9 @@ border_iterate:
       else if (y + scroll_y - node->height - 20 * scale_factor > bottom_boundary)
          goto icons_iterate;
 
+      menu_entry_get(&entry, 0, (unsigned)i, selection_buf, true);
+      menu_entry_get_value(&entry, &entry_value);
+
       /* Prepare text */
       menu_entry_get_rich_label(&entry, &entry_rich_label);