Index: src/fileviews/ufileview.pas
===================================================================
--- src/fileviews/ufileview.pas	(revision 4956)
+++ src/fileviews/ufileview.pas	(working copy)
@@ -1895,11 +1895,20 @@
     FSFile := AFile.FSFile.Clone;
     try
       if FSFile.Name = '..' then
+      begin
+        FFileFilter := '';
         ChangePathToParent(True)
+      end
       else if FSFile.IsLinkToDirectory then
+      begin
+        FFileFilter := '';
         ChooseSymbolicLink(Self, FSFile)
+      end
       else if FSFile.IsDirectory then
+      begin
+        FFileFilter := '';
         ChangePathToChild(FSFile)
+      end
       else if not FolderMode then
         try
           uFileSourceUtil.ChooseFile(Self, FSFile);
Index: src/fileviews/uorderedfileview.pas
===================================================================
--- src/fileviews/uorderedfileview.pas	(revision 4956)
+++ src/fileviews/uorderedfileview.pas	(working copy)
@@ -557,7 +557,7 @@
       if SearchOptions.SearchCase = qscInsensitive then
         sFileName := UTF8LowerCase(sFileName);
 
-      if not MatchesMask(sFileName, sSearchName, SearchOptions.SearchCase = qscSensitive) then
+      if not (MatchesMask(sFileName, sSearchName, SearchOptions.SearchCase = qscSensitive) or (sFileName = '..')) then
         Result := False;
 
       if Result then