diff --git a/applications/main/archive/views/archive_browser_view.c b/applications/main/archive/views/archive_browser_view.c
index 7e2f84fc228..3c2f1321540 100644
--- a/applications/main/archive/views/archive_browser_view.c
+++ b/applications/main/archive/views/archive_browser_view.c
@@ -345,11 +345,13 @@ static bool archive_view_input(InputEvent* event, void* context) {
 
                     if(event->key == InputKeyUp) {
                         if(model->item_idx < scroll_speed) {
-                            scroll_speed = model->item_idx;
+                            model->button_held_for_ticks = 0;
+                            model->item_idx = model->item_cnt - 1;
+                        } else {
+                            model->item_idx =
+                                ((model->item_idx - scroll_speed) + model->item_cnt) %
+                                model->item_cnt;
                         }
-
-                        model->item_idx =
-                            ((model->item_idx - scroll_speed) + model->item_cnt) % model->item_cnt;
                         if(is_file_list_load_required(model)) {
                             model->list_loading = true;
                             browser->callback(ArchiveBrowserEventLoadPrevItems, browser->context);
@@ -361,11 +363,12 @@ static bool archive_view_input(InputEvent* event, void* context) {
                         model->button_held_for_ticks += 1;
                     } else if(event->key == InputKeyDown) {
                         int32_t count = model->item_cnt;
-                        if(model->item_idx >= (count - scroll_speed)) {
-                            scroll_speed = model->item_cnt - model->item_idx - 1;
+                        if(model->item_idx + scroll_speed >= count) {
+                            model->button_held_for_ticks = 0;
+                            model->item_idx = 0;
+                        } else {
+                            model->item_idx = (model->item_idx + scroll_speed) % model->item_cnt;
                         }
-
-                        model->item_idx = (model->item_idx + scroll_speed) % model->item_cnt;
                         if(is_file_list_load_required(model)) {
                             model->list_loading = true;
                             browser->callback(ArchiveBrowserEventLoadNextItems, browser->context);
diff --git a/applications/services/gui/modules/file_browser.c b/applications/services/gui/modules/file_browser.c
index b2a2c3c2389..c764a1cf7e3 100644
--- a/applications/services/gui/modules/file_browser.c
+++ b/applications/services/gui/modules/file_browser.c
@@ -602,11 +602,13 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
 
                     if(event->key == InputKeyUp) {
                         if(model->item_idx < scroll_speed) {
-                            scroll_speed = model->item_idx;
+                            model->button_held_for_ticks = 0;
+                            model->item_idx = model->item_cnt - 1;
+                        } else {
+                            model->item_idx =
+                                ((model->item_idx - scroll_speed) + model->item_cnt) %
+                                model->item_cnt;
                         }
-
-                        model->item_idx =
-                            ((model->item_idx - scroll_speed) + model->item_cnt) % model->item_cnt;
                         if(browser_is_list_load_required(model)) {
                             model->list_loading = true;
                             int32_t load_offset = CLAMP(
@@ -622,10 +624,11 @@ static bool file_browser_view_input_callback(InputEvent* event, void* context) {
                     } else if(event->key == InputKeyDown) {
                         int32_t count = model->item_cnt;
                         if(model->item_idx + scroll_speed >= count) {
-                            scroll_speed = count - model->item_idx - 1;
+                            model->button_held_for_ticks = 0;
+                            model->item_idx = 0;
+                        } else {
+                            model->item_idx = (model->item_idx + scroll_speed) % model->item_cnt;
                         }
-
-                        model->item_idx = (model->item_idx + scroll_speed) % model->item_cnt;
                         if(browser_is_list_load_required(model)) {
                             model->list_loading = true;
                             int32_t load_offset = CLAMP(