2 files changed, 6 insertions, 3 deletions

diff --git a/apps/gui/skin_engine/skin_display.c b/apps/gui/skin_engine/skin_display.c
index e24ab66393..20270a9303 100644
--- a/apps/gui/skin_engine/skin_display.c
+++ b/apps/gui/skin_engine/skin_display.c
@@ -270,9 +270,11 @@ static void wps_display_images(struct gui_wps *gwps, struct viewport* vp)
     }
 #ifdef HAVE_ALBUMART
     /* now draw the AA */
-    if (data->albumart && data->albumart->vp == vp && data->albumart->draw)
+    if (data->albumart && data->albumart->vp == vp 
+            && data->albumart->draw)
     {
         draw_album_art(gwps, audio_current_aa_hid(), false);
+                data->albumart->draw = false;
     }
 #endif
 
diff --git a/apps/gui/skin_engine/skin_tokens.c b/apps/gui/skin_engine/skin_tokens.c
index 758a8c1b04..e0d4595122 100644
--- a/apps/gui/skin_engine/skin_tokens.c
+++ b/apps/gui/skin_engine/skin_tokens.c
@@ -329,8 +329,9 @@ const char *get_token_value(struct gui_wps *gwps,
             
         case WPS_TOKEN_ALBUMART_DISPLAY:
             if (!data->albumart)
-                return NULL;            
-            data->albumart->draw = true;
+                return NULL;        
+                        if (!data->albumart->draw)
+                                data->albumart->draw = true;
             return NULL;
 #endif