diff --git a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java
index c24aef7570e..92f183a180c 100644
--- a/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java
+++ b/rse/plugins/org.eclipse.rse.files.ui/src/org/eclipse/rse/files/ui/widgets/SaveAsForm.java
@@ -216,7 +216,10 @@ public class SaveAsForm extends SystemSelectRemoteFileOrFolderForm {
 						else
 						{
 							fileName =initialFileName;
-							fileNameText.setText(fileName);
+							if (fileName != null)
+							{
+								fileNameText.setText(fileName);
+							}
 							parentFile = remoteFile;
 						}