diff --git a/EduNetworkBuilder/ListBoxWindow.cs b/EduNetworkBuilder/ListBoxWindow.cs
index eae5f73..b23383d 100644
--- a/EduNetworkBuilder/ListBoxWindow.cs
+++ b/EduNetworkBuilder/ListBoxWindow.cs
@@ -378,11 +378,8 @@ namespace EduNetworkBuilder
                 }
                 if(selected != null && selected != "")
                 {
-                    foreach (object one in lbWindowData.Items)
-                    {
-                        if(one.ToString() == selected)
-                            lbWindowData.SelectedItem = selected;
-                    }
+                    if (selectedIndex >= 0 && selectedIndex < lbWindowData.Items.Count)
+                        lbWindowData.SelectedIndex = selectedIndex;
                 }
                 if(lbWindowData.SelectedIndex != -1)
                 {
@@ -788,8 +785,8 @@ namespace EduNetworkBuilder
                                     oursettings.ScoreList.Add(TheName);
                             }
                         }
-                        UpdateForm();
                     }
+                    UpdateForm();
                 }
                 if (MyMode == LBContents.regressiontest)
                     UpdateForm();