--- a/FilenameWidgetWithHistory.st	Mon Feb 07 10:54:50 2011 +0100
+++ b/FilenameWidgetWithHistory.st	Tue Feb 08 09:25:25 2011 +0100
@@ -297,13 +297,12 @@
                             ifTrue:[ self model value ]
                             ifFalse:[ fileNameEntryField contents ].
 
-        defaultPath asFilename isAbsolute ifFalse:[
-            baseDirectory notNil ifTrue:[
-                defaultPath := baseDirectory asFilename construct:defaultPath.
+        defaultPath notEmptyOrNil ifTrue:[
+            defaultPath asFilename isAbsolute ifFalse:[
+                baseDirectory notNil ifTrue:[
+                    defaultPath := baseDirectory asFilename construct:defaultPath.
+                ].
             ].
-        ].
-
-        defaultPath notNil ifTrue:[
             defaultDir := defaultPath asFilename directory.
         ] ifFalse:[     
             defaultDir := initialDirectoryHolder value.
@@ -331,15 +330,15 @@
     ].
     fileNameEntryField contents:path.
 
-    "Modified: / 02-11-2010 / 20:11:45 / cg"
+    "Modified: / 08-02-2011 / 09:24:51 / cg"
 ! !
 
 !FilenameWidgetWithHistory class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/FilenameWidgetWithHistory.st,v 1.18 2010-11-02 19:12:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/FilenameWidgetWithHistory.st,v 1.19 2011-02-08 08:25:25 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libwidg2/FilenameWidgetWithHistory.st,v 1.18 2010-11-02 19:12:20 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/FilenameWidgetWithHistory.st,v 1.19 2011-02-08 08:25:25 cg Exp $'
 ! !