diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp
index 693112236..4e742506d 100644
--- a/radio/src/lcd.cpp
+++ b/radio/src/lcd.cpp
@@ -56,6 +56,7 @@ uint8_t lcdNextPos;
 void lcdPutPattern(xcoord_t x, uint8_t y, const uint8_t * pattern, uint8_t width, uint8_t height, LcdFlags flags)
 {
   uint8_t *p = &displayBuf[ y / 8 * LCD_W + x ];
+  uint8_t *end = &displayBuf[ y / 8 * LCD_W + LCD_W ];
 
   bool blink = false;
   bool inv = false;
@@ -75,7 +76,7 @@ void lcdPutPattern(xcoord_t x, uint8_t y, const uint8_t * pattern, uint8_t width
   // we need to work on the previous byte when INVERS
   p--;
 
-  for (int8_t i=0; i<width+2; i++) {
+  for (int8_t i=0; i<width+2 && p<end; i++) {
     uint8_t lines = (height+7)/8;
     assert(lines <= 5);
     uint8_t b[5] = { 0 };
diff --git a/radio/src/tests/gtests.cpp b/radio/src/tests/gtests.cpp
index 02c800a9a..7767eb849 100644
--- a/radio/src/tests/gtests.cpp
+++ b/radio/src/tests/gtests.cpp
@@ -1062,6 +1062,13 @@ TEST(Lcd, Prec2_Right)
   EXPECT_TRUE(checkScreenshot("prec2_right"));
 }
 
+TEST(Lcd, Line_Wrap)
+{
+  lcd_clear();
+  lcd_puts(LCD_W-10, 0, "TEST");
+  EXPECT_TRUE(checkScreenshot("line_wrap"));
+}
+
 int main(int argc, char **argv)
 {
   QCoreApplication app(argc, argv);
diff --git a/radio/src/tests/line_wrap_128x64.png b/radio/src/tests/line_wrap_128x64.png
new file mode 100755
index 000000000..5863f968d
Binary files /dev/null and b/radio/src/tests/line_wrap_128x64.png differ
diff --git a/radio/src/tests/line_wrap_212x64.png b/radio/src/tests/line_wrap_212x64.png
new file mode 100755
index 000000000..fd67abee8
Binary files /dev/null and b/radio/src/tests/line_wrap_212x64.png differ