diff --git a/macosx/AddWindowController.m b/macosx/AddWindowController.m
index 6460e730b..596c43072 100644
--- a/macosx/AddWindowController.m
+++ b/macosx/AddWindowController.m
@@ -103,11 +103,18 @@
     }
     else
     {
-        //if there is no destination, prompt for one right away
-        [self setDestination: nil];
+        [fLocationField setStringValue: @""];
+        [fLocationImageView setImage: nil];
     }
 }
 
+- (void) windowDidLoad
+{
+    //if there is no destination, prompt for one right away
+    if (!fDestination)
+        [self setDestination: nil];
+}
+
 - (void) dealloc
 {
     [[NSNotificationCenter defaultCenter] removeObserver: self];