diff --git a/menu/drivers/ozone/ozone.c b/menu/drivers/ozone/ozone.c
index cdeafc50b7..a41d95d53c 100644
--- a/menu/drivers/ozone/ozone.c
+++ b/menu/drivers/ozone/ozone.c
@@ -78,8 +78,6 @@ static void ozone_set_thumbnail_content(void *data, const char *s)
          size_t selection      = menu_navigation_get_selection();
          size_t list_size      = menu_entries_get_size();
          file_list_t *list     = menu_entries_get_selection_buf_ptr(0);
-         bool playlist_valid   = false;
-         size_t playlist_index = selection;
 
          /* Get playlist index corresponding
           * to the selected entry */
@@ -87,12 +85,13 @@ static void ozone_set_thumbnail_content(void *data, const char *s)
              (selection < list_size) &&
              (list->list[selection].type == FILE_TYPE_RPL_ENTRY))
          {
-            playlist_valid = true;
-            playlist_index = list->list[selection].entry_idx;
+            size_t playlist_index = list->list[selection].entry_idx;
+            gfx_thumbnail_set_content_playlist(ozone->thumbnail_path_data,
+                  playlist_get_cached(), playlist_index);
          }
-
-         gfx_thumbnail_set_content_playlist(ozone->thumbnail_path_data,
-               playlist_valid ? playlist_get_cached() : NULL, playlist_index);
+         else
+            gfx_thumbnail_set_content_playlist(ozone->thumbnail_path_data,
+                  NULL, selection);
       }
    }
    else if (ozone->is_db_manager_list)
@@ -354,7 +353,7 @@ static enum menu_action ozone_parse_menu_entry_action(
 
    horizontal_list_size       = (unsigned)ozone->horizontal_list.size;
 
-   ozone->messagebox_state    = false || menu_input_dialog_get_display_kb();
+   ozone->messagebox_state    = menu_input_dialog_get_display_kb();
    selection_buf              = menu_entries_get_selection_buf_ptr(0);
    tag                        = (uintptr_t)selection_buf;
    selection                  = menu_navigation_get_selection();
@@ -3518,8 +3517,8 @@ static void ozone_messagebox(void *data, const char *message)
       ozone->pending_message = NULL;
    }
 
-   ozone->pending_message = strdup(message);
-   ozone->messagebox_state = true || menu_input_dialog_get_display_kb();
+   ozone->pending_message        = strdup(message);
+   ozone->messagebox_state       = true;
    ozone->should_draw_messagebox = true;
 }
 
diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index a4ff2dbe2b..57ce04783d 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -951,6 +951,7 @@ static void xmb_render_messagebox_internal(
    struct string_list list  = {0};
    gfx_display_t            *p_disp  = disp_get_ptr();
    gfx_display_ctx_driver_t *dispctx = p_disp->dispctx;
+   bool input_dialog_display_kb      = false;
 
    wrapped_message[0]       = '\0';
 
@@ -982,14 +983,15 @@ static void xmb_render_messagebox_internal(
       return;
    }
 
-   line_height      = xmb->font->size * 1.2;
+   input_dialog_display_kb = menu_input_dialog_get_display_kb();
+   line_height             = xmb->font->size * 1.2;
 
-   y_position       = video_height / 2;
-   if (menu_input_dialog_get_display_kb())
-      y_position    = video_height / 4;
+   y_position              = video_height / 2;
+   if (input_dialog_display_kb)
+      y_position           = video_height / 4;
 
-   x                = video_width  / 2;
-   y                = y_position - (list.size-1) * line_height / 2;
+   x                       = video_width  / 2;
+   y                       = y_position - (list.size-1) * line_height / 2;
 
    /* find the longest line width */
    for (i = 0; i < list.size; i++)
@@ -1035,7 +1037,7 @@ static void xmb_render_messagebox_internal(
                TEXT_ALIGN_LEFT, 1.0f, false, 0.0f, false);
    }
 
-   if (menu_input_dialog_get_display_kb())
+   if (input_dialog_display_kb)
       gfx_display_draw_keyboard(
             userdata,
             video_width,
@@ -4667,6 +4669,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
    float menu_wallpaper_opacity            = video_info->menu_wallpaper_opacity;
    gfx_display_t            *p_disp        = disp_get_ptr();
    gfx_display_ctx_driver_t *dispctx       = p_disp->dispctx;
+   bool input_dialog_display_kb            = menu_input_dialog_get_display_kb();
 
    if (!xmb)
       return;
@@ -5265,7 +5268,7 @@ static void xmb_frame(void *data, video_frame_info_t *video_info)
          xmb_color_theme,
          settings, selection);
 
-   if (menu_input_dialog_get_display_kb())
+   if (input_dialog_display_kb)
    {
       const char *str   = menu_input_dialog_get_buffer();
       const char *label = menu_input_dialog_get_label_buffer();