1 files changed, 9 insertions, 2 deletions

diff --git a/apps/plugins/imageviewer/imageviewer.c b/apps/plugins/imageviewer/imageviewer.c
index 37c5838d73..4b1a982438 100644
--- a/apps/plugins/imageviewer/imageviewer.c
+++ b/apps/plugins/imageviewer/imageviewer.c
@@ -509,6 +509,13 @@ static void pan_view_up(struct image_info *info)
    the bottom */
 static void pan_view_down(struct image_info *info)
 {
+    static fb_data *lcd_fb = NULL;
+    if (!lcd_fb)
+    {
+        struct viewport *vp_main = *(rb->screens[SCREEN_MAIN]->current_viewport);
+        lcd_fb = vp_main->buffer->fb_ptr;
+    }
+
     int move;
 
     move = MIN(VSCROLL, info->height - info->y - LCD_HEIGHT);
@@ -526,7 +533,7 @@ static void pan_view_down(struct image_info *info)
              */
             move++, info->y--;
             rb->memcpy(rgb_linebuf,
-                    *rb->lcd_framebuffer + (LCD_HEIGHT - move)*LCD_WIDTH,
+                    lcd_fb + (LCD_HEIGHT - move)*LCD_WIDTH,
                     LCD_WIDTH*sizeof (fb_data));
         }
 #endif
@@ -539,7 +546,7 @@ static void pan_view_down(struct image_info *info)
          && settings.jpeg_dither_mode == DITHER_DIFFUSION)
         {
             /* Cover the first row drawn with previous image data. */
-            rb->memcpy(*rb->lcd_framebuffer + (LCD_HEIGHT - move)*LCD_WIDTH,
+            rb->memcpy(lcd_fb + (LCD_HEIGHT - move)*LCD_WIDTH,
                         rgb_linebuf, LCD_WIDTH*sizeof (fb_data));
             info->y++;
         }