diff --git a/DisplayMagician/Properties/AssemblyInfo.cs b/DisplayMagician/Properties/AssemblyInfo.cs
index 06704a1..ce3dbfc 100644
--- a/DisplayMagician/Properties/AssemblyInfo.cs
+++ b/DisplayMagician/Properties/AssemblyInfo.cs
@@ -26,8 +26,8 @@ using System.Resources;
 [assembly: Guid("e4ceaf5e-ad01-4695-b179-31168eb74c48")]
 
 // Version information
-[assembly: AssemblyVersion("2.1.0.157")]
-[assembly: AssemblyFileVersion("2.1.0.157")]
+[assembly: AssemblyVersion("2.1.0.159")]
+[assembly: AssemblyFileVersion("2.1.0.159")]
 [assembly: NeutralResourcesLanguageAttribute( "en" )]
 [assembly: CLSCompliant(true)]
 
diff --git a/DisplayMagician/UIForms/ChooseImageForm.cs b/DisplayMagician/UIForms/ChooseImageForm.cs
index 554c02d..7155557 100644
--- a/DisplayMagician/UIForms/ChooseImageForm.cs
+++ b/DisplayMagician/UIForms/ChooseImageForm.cs
@@ -78,9 +78,6 @@ namespace DisplayMagician.UIForms
             lv_icons.Items.Clear();
             if (AvailableImages.Count > 0)
             {
-                bool alreadySelected = false;
-                // Load all the images into the list
-                int imageCount = 1;
                 foreach (ShortcutBitmap sc in AvailableImages)
                 {
                     string[] stringsToAdd = new string[] {
@@ -89,9 +86,11 @@ namespace DisplayMagician.UIForms
                     };
                     ListViewItem lvi = new ListViewItem(stringsToAdd);
                     lvi.Name = sc.UUID;
-                    if (sc.Equals(SelectedImage))
+                    if (ImageUtils.ImagesAreEqual(sc.Image,SelectedImage.Image))
                     {
                         lvi.Selected = true;
+                        lvi.Focused = true;
+                        lvi.EnsureVisible();
                         pb_selected_icon.Image = SelectedImage.Image;
                         _selectedImage = sc;
                     }