diff --git a/src/FileBrowser.cpp b/src/FileBrowser.cpp
index 15a5e96..b8a0937 100644
--- a/src/FileBrowser.cpp
+++ b/src/FileBrowser.cpp
@@ -886,6 +886,9 @@ bool FileBrowser::AddToCaddy(FileBrowser::BrowsableList::Entry* current)
 		for (unsigned i = 0; i < folder.entries.size(); ++i)
 			ret |= AddImageToCaddy(&folder.entries[i]);
 
+		folder.currentIndex = folder.entries.size() - 1;
+		folder.SetCurrent();
+
 		RefeshDisplay();
 		return ret;
 	}