diff --git a/gfx/gfx_animation.c b/gfx/gfx_animation.c
index c00b2778f9..daa589eb74 100644
--- a/gfx/gfx_animation.c
+++ b/gfx/gfx_animation.c
@@ -1679,6 +1679,7 @@ bool gfx_animation_ticker_smooth(gfx_animation_ctx_ticker_smooth_t *ticker)
    size_t i;
    size_t src_str_len           = 0;
    size_t spacer_len            = 0;
+   unsigned small_src_char_widths[64] = {0};
    unsigned src_str_width       = 0;
    unsigned spacer_width        = 0;
    unsigned *src_char_widths    = NULL;
@@ -1706,7 +1707,6 @@ bool gfx_animation_ticker_smooth(gfx_animation_ctx_ticker_smooth_t *ticker)
    if (src_str_len < 1)
       goto end;
 
-   unsigned small_src_char_widths[64] = {0};
    src_char_widths = small_src_char_widths;
 
    if (src_str_len > ARRAY_SIZE(small_src_char_widths))
diff --git a/menu/drivers/rgui.c b/menu/drivers/rgui.c
index 2eab093df9..5446909f61 100644
--- a/menu/drivers/rgui.c
+++ b/menu/drivers/rgui.c
@@ -2929,8 +2929,8 @@ int rgui_osk_ptr_at_pos(void *data, int x, int y,
       unsigned key_row     = (unsigned)(key_index / OSK_CHARS_PER_LINE);
       unsigned key_column  = (unsigned)(key_index - (key_row * OSK_CHARS_PER_LINE));
 
-      unsigned osk_ptr_x = osk_x + keyboard_offset_x + ptr_offset_x + (key_column * key_width);
-      unsigned osk_ptr_y = osk_y + keyboard_offset_y + ptr_offset_y + (key_row    * key_height);
+      unsigned osk_ptr_x   = osk_x + keyboard_offset_x + ptr_offset_x + (key_column * key_width);
+      unsigned osk_ptr_y   = osk_y + keyboard_offset_y + ptr_offset_y + (key_row    * key_height);
 
       if (x > osk_ptr_x && x < osk_ptr_x + ptr_width &&
           y > osk_ptr_y && y < osk_ptr_y + ptr_height)