diff --git a/src/core/image.c b/src/core/image.c
index 01091f1b..86c264c2 100644
--- a/src/core/image.c
+++ b/src/core/image.c
@@ -128,6 +128,12 @@ int register_image ( struct image *image ) {
 			   imgindex++ );
 	}
 
+	/* Avoid ending up with multiple "selected" images on
+	 * re-registration
+	 */
+	if ( image_find_selected() )
+		image->flags &= ~IMAGE_SELECTED;
+
 	/* Add to image list */
 	image_get ( image );
 	image->flags |= IMAGE_REGISTERED;