diff --git a/apps/gui/scrollbar.c b/apps/gui/scrollbar.c
index 0cb3602d11..8a0b885c4b 100644
--- a/apps/gui/scrollbar.c
+++ b/apps/gui/scrollbar.c
@@ -92,6 +92,14 @@ void gui_scrollbar_draw(struct screen * screen, int x, int y,
     inner_y  = y + 1;
     inner_wd = width  - 2;
     inner_ht = height - 2;
+    
+    /* Boundary check to make sure that height is reasonable, otherwise nothing
+     *  to do 
+     */
+    if(height<2 || width<2)
+    {
+        return;
+    }
 
     if (flags & HORIZONTAL)
         inner_len = inner_wd;
diff --git a/firmware/export/config-mrobe500.h b/firmware/export/config-mrobe500.h
index 4010b036d1..29c2670f9e 100644
--- a/firmware/export/config-mrobe500.h
+++ b/firmware/export/config-mrobe500.h
@@ -91,7 +91,7 @@
 /* remote LCD */
 #define HAVE_REMOTE_LCD
 #define LCD_REMOTE_WIDTH  79
-#define LCD_REMOTE_HEIGHT 64
+#define LCD_REMOTE_HEIGHT 16
 #define LCD_REMOTE_DEPTH  1
 
 /* Remote display colours, for screenshots and sim (0xRRGGBB) */