--- UMain.pas	2010-06-07 02:19:04.000000000 +0200
+++ UMain.pas.mod	2010-06-07 02:18:03.000000000 +0200
@@ -2385,7 +2385,15 @@
                  else Engine := RightPanelEngine;
 
     try
+      NewDir := PDataItem(ListView.Selected.Data)^.FDisplayName;
+      if PDataItem(ListView.Selected.Data)^.IsDir then begin
+        if PDataItem(ListView.Selected.Data)^.UpDir then NewDir := '';
+      end else begin
+        if AnsiPos('.', NewDir) > 1 then Delete(NewDir, Length(NewDir) - Length(ExtractFileExt(NewDir)) + 1, Length(ExtractFileExt(NewDir)) );
+      end;
       FNewDir := TFNewDir.Create(Self);
+      FNewDir.Entry.Text := NewDir;
+      FNewDir.Entry.SelectAll;
       if FNewDir.Run = mbOK
         then NewDir := UTF8ToStr(FNewDir.Entry.Text)
         else Exit;