diff --git a/src/FileBrowser.cpp b/src/FileBrowser.cpp
index 5a60495..ff841e9 100644
--- a/src/FileBrowser.cpp
+++ b/src/FileBrowser.cpp
@@ -271,6 +271,11 @@ bool FileBrowser::BrowsableListView::CheckBrowseNavigation(bool pageOnly)
 				offset++;
 			dirty = true;
 		}
+		else
+		{
+			list->currentIndex = 0;
+			dirty = true;
+		}
 	}
 	if (inputMappings->BrowseUp())
 	{
@@ -285,6 +290,11 @@ bool FileBrowser::BrowsableListView::CheckBrowseNavigation(bool pageOnly)
 				offset--;
 			dirty = true;
 		}
+		else
+		{
+			list->currentIndex = list->entries.size() - 1;
+			dirty = true;
+		}
 	}
 	if ((lcdPgUpDown && inputMappings->BrowsePageDownLCD()) || (!lcdPgUpDown && inputMappings->BrowsePageDown()))
 	{