diff --git a/menu/drivers/ozone/ozone_display.c b/menu/drivers/ozone/ozone_display.c
index dc907a7b2c..25887f7870 100644
--- a/menu/drivers/ozone/ozone_display.c
+++ b/menu/drivers/ozone/ozone_display.c
@@ -107,9 +107,6 @@ void ozone_draw_text(
       uint32_t color,
       bool draw_outside)
 {
-   if ((color & 0x000000FF) == 0)
-      return;
-
    menu_display_draw_text(font, str, x, y,
          width, height, color, text_align, 1.0f,
          false,
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 165604e810..03df457ff0 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -1588,10 +1588,13 @@ void menu_display_draw_text(
 {
    struct font_params params;
 
+   if ((color & 0x000000FF) == 0)
+      return;
+
    /* Don't draw outside of the screen */
-   if (     ((x < -64 || x > width  + 64)
+   if (!draw_outside &&
+           ((x < -64 || x > width  + 64)
          || (y < -64 || y > height + 64))
-         && !draw_outside
       )
       return;