diff --git a/firmware/layout2.c b/firmware/layout2.c
index fe6c920eac..3f593dc44c 100644
--- a/firmware/layout2.c
+++ b/firmware/layout2.c
@@ -486,7 +486,7 @@ void layoutAddress(const char *address, const char *desc, bool qrcode, bool igno
 			}
 		}
 	} else {
-		uint32_t rowlen = (addrlen - 1) / (addrlen <= 40 ? 2 : addrlen <= 60 ? 3 : 4) + 1;
+		uint32_t rowlen = (addrlen - 1) / (addrlen <= 42 ? 2 : addrlen <= 63 ? 3 : 4) + 1;
 		const char **str = split_message((const uint8_t *)address, addrlen, rowlen);
 		if (desc) {
 			oledDrawString(0, 0 * 9, desc, FONT_STANDARD);