diff --git a/gfx/gfx_display.c b/gfx/gfx_display.c
index 775e2cffee..5a5ae61c67 100644
--- a/gfx/gfx_display.c
+++ b/gfx/gfx_display.c
@@ -123,7 +123,7 @@ static gfx_display_ctx_driver_t *gfx_display_ctx_drivers[] = {
    NULL,
 };
 
-float gfx_display_get_adjusted_scale(
+static float gfx_display_get_adjusted_scale(
       gfx_display_t *p_disp,
       float base_scale, float scale_factor, unsigned width)
 {
diff --git a/gfx/gfx_display.h b/gfx/gfx_display.h
index d40b41cd07..8f5c321168 100644
--- a/gfx/gfx_display.h
+++ b/gfx/gfx_display.h
@@ -308,10 +308,6 @@ bool gfx_display_reset_textures_list_buffer(
 int gfx_display_osk_ptr_at_pos(void *data, int x, int y,
       unsigned width, unsigned height);
 
-float gfx_display_get_adjusted_scale(
-      gfx_display_t *p_disp,
-      float base_scale, float scale_factor, unsigned width);
-
 float gfx_display_get_dpi_scale(
       gfx_display_t *p_disp,
       void *settings_data,
diff --git a/gfx/gfx_widgets.c b/gfx/gfx_widgets.c
index 4763e89a43..b2eaa4e7fa 100644
--- a/gfx/gfx_widgets.c
+++ b/gfx/gfx_widgets.c
@@ -139,9 +139,9 @@ static float gfx_display_get_widget_pixel_scale(
     * to optimise). We therefore cache the pixel scale,
     * and only update on first run or when the video
     * size changes */
-   if (!scale_cached ||
-       (width  != last_width) ||
-       (height != last_height))
+   if (   !scale_cached
+       || (width  != last_width)
+       || (height != last_height))
    {
       /* Baseline reference is a 1080p display */
       scale = (float)(
@@ -156,13 +156,12 @@ static float gfx_display_get_widget_pixel_scale(
 
    /* Adjusted scale calculation may also be slow, so
     * only update if something changes */
-   if (scale_updated ||
-       (menu_scale_factor != last_menu_scale_factor) ||
-       (p_disp->menu_driver_id != last_menu_driver_id))
+   if (    scale_updated
+       || (menu_scale_factor != last_menu_scale_factor)
+       || (p_disp->menu_driver_id != last_menu_driver_id))
    {
-      adjusted_scale         = gfx_display_get_adjusted_scale(
-            p_disp,
-            scale, menu_scale_factor, width);
+      adjusted_scale         = scale * menu_scale_factor;
+      adjusted_scale         = (adjusted_scale > 0.0001f) ? adjusted_scale : 1.0f;
       last_menu_scale_factor = menu_scale_factor;
       last_menu_driver_id    = p_disp->menu_driver_id;
    }