diff --git a/menu/drivers/ozone/ozone_entries.c b/menu/drivers/ozone/ozone_entries.c
index 703146d3a8..0213de90c5 100644
--- a/menu/drivers/ozone/ozone_entries.c
+++ b/menu/drivers/ozone/ozone_entries.c
@@ -737,7 +737,7 @@ void ozone_draw_thumbnail_bar(ozone_handle_t *ozone, video_frame_info_t *video_i
    }
 
    /* Bottom row : "left" thumbnail or content metadata */
-   if (left_thumbnail)
+   if (thumbnail && left_thumbnail)
    {
       unsigned thumb_x_position = x_position + sidebar_width/2 - (ozone->dimensions.left_thumbnail_width + ozone->dimensions.sidebar_entry_icon_padding) / 2;
       unsigned thumb_y_position = video_info->height / 2 + ozone->dimensions.sidebar_entry_icon_padding / 2;
diff --git a/menu/drivers/ozone/ozone_sidebar.c b/menu/drivers/ozone/ozone_sidebar.c
index ba77c8123d..4588b93768 100644
--- a/menu/drivers/ozone/ozone_sidebar.c
+++ b/menu/drivers/ozone/ozone_sidebar.c
@@ -746,30 +746,39 @@ bool ozone_is_playlist(ozone_handle_t *ozone, bool depth)
 {
    bool is_playlist;
 
-   switch (ozone->categories_selection_ptr)
+   if (ozone->categories_selection_ptr > ozone->system_tab_end)
    {
-      case OZONE_SYSTEM_TAB_MAIN:
-      case OZONE_SYSTEM_TAB_SETTINGS:
-      case OZONE_SYSTEM_TAB_ADD:
-         is_playlist = false;
-         break;
-      case OZONE_SYSTEM_TAB_HISTORY:
-      case OZONE_SYSTEM_TAB_FAVORITES:
-      case OZONE_SYSTEM_TAB_MUSIC:
+      is_playlist = true;
+   }
+   else
+   {
+      switch (ozone->tabs[ozone->categories_selection_ptr])
+      {
+         case OZONE_SYSTEM_TAB_MAIN:
+         case OZONE_SYSTEM_TAB_SETTINGS:
+         case OZONE_SYSTEM_TAB_ADD:
+#ifdef HAVE_NETWORKING
+         case OZONE_SYSTEM_TAB_NETPLAY:
+#endif
+            is_playlist = false;
+            break;
+         case OZONE_SYSTEM_TAB_HISTORY:
+         case OZONE_SYSTEM_TAB_FAVORITES:
+         case OZONE_SYSTEM_TAB_MUSIC:
 #if defined(HAVE_FFMPEG) || defined(HAVE_MPV)
-      case OZONE_SYSTEM_TAB_VIDEO:
+         case OZONE_SYSTEM_TAB_VIDEO:
 #endif
 #ifdef HAVE_IMAGEVIEWER
-      case OZONE_SYSTEM_TAB_IMAGES:
+         case OZONE_SYSTEM_TAB_IMAGES:
 #endif
-#ifdef HAVE_NETWORKING
-      case OZONE_SYSTEM_TAB_NETPLAY:
-#endif
-      default:
-         is_playlist = true;
-         break;
+         default:
+            is_playlist = true;
+            break;
+      }
    }
 
+
+
    if (depth)
       return is_playlist && ozone->depth == 1;