diff --git a/src/gui/filebrowser.cpp b/src/gui/filebrowser.cpp
index b6aacabbd..2d3ae691d 100644
--- a/src/gui/filebrowser.cpp
+++ b/src/gui/filebrowser.cpp
@@ -845,8 +845,12 @@ bool CFileBrowser::exec(const char * const dirname)
 	std::replace(name.begin(), name.end(), '\\', '/');
 
 	paintHead();
-	ChangeDir(name);
-	paint();
+	int selection = -1;
+	if (name == Path)
+		selection = selected;
+		
+	ChangeDir(name, selection);
+	//paint();
 	paintFoot();
 
 	int oldselected = selected;
@@ -1071,7 +1075,10 @@ bool CFileBrowser::exec(const char * const dirname)
 								ChangeDir(filelist[selected].Url);
 							else
 #endif
+							{
+								selections.push_back(selected);
 								ChangeDir(filelist[selected].Name);
+							}
 						}
 						else
 						{