diff --git a/apps/gui/skin_engine/skin_buffer.c b/apps/gui/skin_engine/skin_buffer.c
index 57b80f1672..42d47cc20f 100644
--- a/apps/gui/skin_engine/skin_buffer.c
+++ b/apps/gui/skin_engine/skin_buffer.c
@@ -55,11 +55,11 @@
 
 
 #ifdef HAVE_LCD_BITMAP
-#define MAIN_BUFFER ((2*LCD_BACKDROP_BYTES) \
+#define MAIN_BUFFER ((2*(LCD_FBHEIGHT*LCD_FBWIDTH*sizeof(fb_data))) \
                     + (SKINNABLE_SCREENS_COUNT * LCD_BACKDROP_BYTES))
 
 #if (NB_SCREENS > 1)
-#define REMOTE_BUFFER ((2*REMOTE_LCD_BACKDROP_BYTES) \
+#define REMOTE_BUFFER ((2*(LCD_REMOTE_FBHEIGHT*LCD_REMOTE_FBWIDTH*sizeof(fb_remote_data))) \
                       + (SKINNABLE_SCREENS_COUNT * REMOTE_LCD_BACKDROP_BYTES))
 #else
 #define REMOTE_BUFFER 0