diff --git a/radio/src/lcd_taranis.cpp b/radio/src/lcd_taranis.cpp
index 121698355..60717f886 100755
--- a/radio/src/lcd_taranis.cpp
+++ b/radio/src/lcd_taranis.cpp
@@ -145,7 +145,12 @@ void lcd_bmp(xcoord_t x, uint8_t y, const pm_uchar * img, uint8_t offset, uint8_
 {
   const pm_uchar *q = img;
   uint8_t w    = pgm_read_byte(q++);
-  if (!width) width = w;
+  if (!width || width > w) {
+    width = w;
+  }
+  if (x+width > LCD_W) {
+    width = LCD_W-x;
+  }
   uint8_t rows = (pgm_read_byte(q++) + 1) / 2;
 
   for (uint8_t row=0; row<rows; row++) {
diff --git a/radio/src/tests/bmpwrapping_212x64.png b/radio/src/tests/bmpwrapping_212x64.png
new file mode 100755
index 000000000..25e2cfda3
Binary files /dev/null and b/radio/src/tests/bmpwrapping_212x64.png differ
diff --git a/radio/src/tests/lcd.cpp b/radio/src/tests/lcd.cpp
index f6ecff4f4..350255415 100644
--- a/radio/src/tests/lcd.cpp
+++ b/radio/src/tests/lcd.cpp
@@ -255,3 +255,15 @@ TEST(Lcd, DrawSwitch)
   EXPECT_TRUE(checkScreenshot("drawswitch"));
 }
 #endif
+
+#if defined(PCBTARANIS)
+TEST(Lcd, BMPWrapping)
+{
+  lcd_clear();
+  uint8_t bitmap[2+40*40/2];
+  bmpLoad(bitmap, "./tests/plane.bmp", 40, 40);
+  lcd_bmp(200, 0, bitmap);
+  lcd_bmp(200, 60, bitmap);
+  EXPECT_TRUE(checkScreenshot("bmpwrapping"));
+}
+#endif
diff --git a/radio/src/tests/plane.bmp b/radio/src/tests/plane.bmp
new file mode 100755
index 000000000..dde0e10be
Binary files /dev/null and b/radio/src/tests/plane.bmp differ