--- a/FileApplicationNoteBook.st	Fri Sep 20 17:15:51 2019 +0200
+++ b/FileApplicationNoteBook.st	Thu Sep 26 08:58:17 2019 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2002 by eXept Software AG
               All Rights Reserved
@@ -5658,7 +5656,10 @@
 
     fn := self fileName.
     fn isNil ifTrue:[
-        fn := 'unknown'
+        Error ignoreIn:[
+            fn := self topApplication fileEntryFieldHolder value
+        ].
+        fn := fn ? 'unknown'
     ] ifFalse:[
         fn := fn baseName.
     ].
@@ -6174,7 +6175,12 @@
         base := fn baseName.
     ].
 
-    ask ifTrue:[
+    (ask or:[fn isNil]) ifTrue:[
+        fn isNil ifTrue:[
+            Error ignoreIn:[
+                fn := self topApplication fileEntryFieldHolder value
+            ].
+        ].
         defaultDir := master notNil ifTrue:[ master currentDirectory ] ifFalse:[ nil ].
         defaultDir isNil ifTrue:[
             fn notNil ifTrue:[
@@ -6205,7 +6211,7 @@
 
     (editView saveAs:fn doAppend:false compressTabs:master compressTabsOnSave eolMode:master lineEndConvention) ifFalse:[^ self].
 
-    textEditorModificationTime := self fileName modificationTime.
+    textEditorModificationTime := fn modificationTime.
 
     doMD5ModificationCheck ifTrue:[
         md5CheckSum := self getHashForContents:self fileContentsModel value.
@@ -6215,7 +6221,7 @@
     self itemChanged value:false.
     self itemRemoved value:false.
     self modifiedChannel value:false.
-    self notify:self fileName asString, ' saved'.
+    self notify:fn asString, ' saved'.
     tagsBrowser notNil ifTrue:[
         tagsBrowser updateTagList
     ].