From 704983b4b9a47d9b2ce79d5bb9991c7ec881d788 Mon Sep 17 00:00:00 2001
From: Willy-JL <49810075+Willy-JL@users.noreply.github.com>
Date: Fri, 21 Jul 2023 15:45:43 +0100
Subject: [PATCH] Fix wii menu sticking to right with 2 app columns

---
 applications/services/gui/modules/menu.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/applications/services/gui/modules/menu.c b/applications/services/gui/modules/menu.c
index 29c5b4131..5dba503ca 100644
--- a/applications/services/gui/modules/menu.c
+++ b/applications/services/gui/modules/menu.c
@@ -50,12 +50,14 @@ static void menu_draw_callback(Canvas* canvas, void* _model) {
         size_t shift_position;
         if(XTREME_SETTINGS()->wii_menu) {
             FuriString* name = furi_string_alloc();
-            if(position < 2) {
-                shift_position = 0;
-            } else if(position >= items_count - 2 + (items_count % 2)) {
-                shift_position = position - (position % 2) - 4;
+            if(items_count > 6 && position >= 4) {
+                if(position >= items_count - 2 + (items_count % 2)) {
+                    shift_position = position - (position % 2) - 4;
+                } else {
+                    shift_position = position - (position % 2) - 2;
+                }
             } else {
-                shift_position = position - (position % 2) - 2;
+                shift_position = 0;
             }
             canvas_set_font(canvas, FontSecondary);
             size_t item_i;