Issue #682, continued…

src/Preferences/GeneralPreferencesViewController.m

@@ -177,16 +177,15 @@ -(void)refreshLinkHandler
     }
 
     NSString * regAppName = [[NSFileManager defaultManager] displayNameAtPath:registeredAppURL];
+    // Maintain a table to map from the short name to the file URL for when
+    // the user changes selection and we later need the file URL to register
+    // the new selection.
     if (regAppName != nil) {
         [linksHandler addItemWithTitle:regAppName image:[[NSWorkspace sharedWorkspace] iconForFile:registeredAppURL]];
         [linksHandler addSeparator];
+        [appToPathMap setValue:registeredAppURL forKey:regAppName];
     }
-
-    // Maintain a table to map from the short name to the file URL for when
-    // the user changes selection and we later need the file URL to register
-    // the new selection.
-    [appToPathMap setValue:registeredAppURL forKey:regAppName];
-
+
     // Next, add the list of all registered link handlers under the /Applications folder
     // except for the registered application.
     CFArrayRef cfArrayOfApps = LSCopyApplicationURLsForURL((__bridge CFURLRef)testURL, kLSRolesAll);