diff --git a/macosx/CreatorWindowController.m b/macosx/CreatorWindowController.m
index 57a390eb9..da8e3a83a 100644
--- a/macosx/CreatorWindowController.m
+++ b/macosx/CreatorWindowController.m
@@ -223,6 +223,10 @@
 
 - (void) create: (id) sender
 {
+    //make sure the trackers are no longer being verified
+    if ([fTrackerTable editedRow] != -1)
+        [[self window] endEditingFor: fTrackerTable];
+    
     if ([fTrackers count] == 0 && [fDefaults boolForKey: @"WarningCreatorBlankAddress"])
     {
         NSAlert * alert = [[NSAlert alloc] init];