diff --git a/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java b/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
index f578898..aec12b5 100644
--- a/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
+++ b/src/com/webcodepro/applecommander/ui/swt/DiskExplorerTab.java
@@ -1108,9 +1108,6 @@ public class DiskExplorerTab {
 					FileEntry fileEntry = directory.createFile();
 					fileEntry.setFilename(spec.getTargetFilename());
 					fileEntry.setFiletype(spec.getFiletype());
-					if (fileEntry.needsAddress()) {
-						fileEntry.setAddress(spec.getAddress());
-					}
 					try {
 						fileEntry.setFileData(buffer.toByteArray());
 					} catch (ProdosDiskSizeDoesNotMatchException ex) {
@@ -1130,6 +1127,9 @@ public class DiskExplorerTab {
 							fileEntry.setFileData(buffer.toByteArray());
 						}
 					}
+					if (fileEntry.needsAddress()) {
+						fileEntry.setAddress(spec.getAddress());
+					}
 				}
 			} catch (Exception ex) {
 				MessageBox box = new MessageBox(shell,