diff --git a/source/screens/scriptBrowse.cpp b/source/screens/scriptBrowse.cpp
index e1fad91..17f49ad 100644
--- a/source/screens/scriptBrowse.cpp
+++ b/source/screens/scriptBrowse.cpp
@@ -96,6 +96,7 @@ void ScriptBrowse::Draw(void) const {
 
 
 void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
+	if (keyRepeatDelay)	keyRepeatDelay--;
 	if (hDown & KEY_B) {
 		jsonFileBrowse.clear();
 		Gui::screenBack();
@@ -135,4 +136,10 @@ void ScriptBrowse::Logic(u32 hDown, u32 hHeld, touchPosition touch) {
 			downloadToFile(jsonFileBrowse[selection]["url"], Config::ScriptPath + std::string(jsonFileBrowse[selection]["title"])+ ".json");
 		}
 	}
+
+	if(selection < screenPos) {
+		screenPos = selection;
+	} else if (selection > screenPos + ENTRIES_PER_SCREEN - 1) {
+		screenPos = selection - ENTRIES_PER_SCREEN + 1;
+	}
 }
\ No newline at end of file