diff --git a/comp/src/gb.form/.src/File/Chooser/FDirChooser.class b/comp/src/gb.form/.src/File/Chooser/FDirChooser.class
index 1805fdf9a..62831444b 100644
--- a/comp/src/gb.form/.src/File/Chooser/FDirChooser.class
+++ b/comp/src/gb.form/.src/File/Chooser/FDirChooser.class
@@ -1219,7 +1219,10 @@ Public Sub mnuUncompress_Click()
   Reload
   
   hTreeView = dvwChoose.Proxy
-  If sShow Then Try hTreeView[fvwChoose.Dir &/ sShow].EnsureVisible
+  If sShow Then 
+    Try hTreeView[fvwChoose.Dir &/ sShow].EnsureVisible
+    Try hTreeView[fvwChoose.Dir &/ sShow].Selected = True
+  Endif
   
   Return
   
diff --git a/comp/src/gb.form/.src/File/DirCache.class b/comp/src/gb.form/.src/File/DirCache.class
index f33531fee..6d6b522da 100644
--- a/comp/src/gb.form/.src/File/DirCache.class
+++ b/comp/src/gb.form/.src/File/DirCache.class
@@ -15,6 +15,8 @@ Static Public Sub _get(sDir As String) As DirCache
   
   Dim hCache As DirCache
   
+  If Right(sDir) <> "/" Then sDir &= "/"
+  
   hCache = $cCache[sDir]
   If Not hCache Then
     hCache = New DirCache(sDir)
@@ -121,6 +123,7 @@ End
 
 Public Sub Lock()
   
+  If $iLock = 0 Then CheckValid
   Inc $iLock
   
 End