diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 303a078d96..8593ccb505 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1012,9 +1012,7 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
       menu_handle_t *menu    = menu_driver_get_ptr();
       uint32_t hash_label    = 0;
       uint32_t hash_value    = 0;
-      bool val1_enable       = false;
-      bool val2_enable       = false;
-      bool val3_enable       = false;
+      bool do_draw_text      = false;
 
       if (!node)
          continue;
@@ -1089,22 +1087,36 @@ static void xmb_draw_items(xmb_handle_t *xmb, gl_t *gl,
             frame_count / 20, entry.value,
             (i == current));
 
-      val1_enable = (
-               (hash_value != MENU_VALUE_MORE)
-            && (hash_value != MENU_VALUE_CORE)
-            && (hash_value != MENU_VALUE_RDB)
-            && (hash_value != MENU_VALUE_CURSOR)
-            && (hash_value != MENU_VALUE_FILE)
-            && (hash_value != MENU_VALUE_DIR)
-            && (hash_value != MENU_VALUE_COMP)
-            && (hash_value != MENU_VALUE_ON)
-            && (hash_value != MENU_VALUE_OFF)
-         );
+      switch (hash_value)
+      {
+         case MENU_VALUE_COMP:
+            break;
+         case MENU_VALUE_MORE:
+            break;
+         case MENU_VALUE_CORE:
+            break;
+         case MENU_VALUE_RDB:
+            break;
+         case MENU_VALUE_CURSOR:
+            break;
+         case MENU_VALUE_FILE:
+            break;
+         case MENU_VALUE_DIR:
+            break;
+         case MENU_VALUE_ON:
+            if (!xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id)
+               do_draw_text = true;
+            break;
+         case MENU_VALUE_OFF:
+            if (!xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id)
+               do_draw_text = true;
+            break;
+         default:
+            do_draw_text = true;
+            break;
+      }
 
-      val2_enable = ((hash_value == MENU_VALUE_ON)  && !xmb->textures.list[XMB_TEXTURE_SWITCH_ON].id);
-      val3_enable = ((hash_value == MENU_VALUE_OFF) && !xmb->textures.list[XMB_TEXTURE_SWITCH_OFF].id);
-
-      if(val1_enable || val2_enable || val3_enable)
+      if (do_draw_text)
          xmb_draw_text(menu, xmb, value,
                node->x + xmb->margins.screen.left + xmb->icon.spacing.horizontal + 
                xmb->margins.label.left + xmb->margins.setting.left,