diff --git a/GensConfigTool/MainWindow.xaml.cs b/GensConfigTool/MainWindow.xaml.cs
index 7885256..156952b 100644
--- a/GensConfigTool/MainWindow.xaml.cs
+++ b/GensConfigTool/MainWindow.xaml.cs
@@ -79,18 +79,23 @@ public MainWindow()
 
         private void UpdateConfigView()
         {
-            int idx;
-            if (this.Configuration.GraphicsAdapter != null && (idx = this.GPUSelector.Items.IndexOf(this.Configuration.GraphicsAdapter)) >= 0)
+            int idx = this.GPUSelector.Items.IndexOf(null);
+            if (idx >= 0)
             {
                 this.GPUSelector.SelectedIndex = idx;
+
                 this.ResSelector.ItemsSource = ((GraphicsAdapter)this.GPUSelector.SelectedItem).Resolutions;
-                idx = this.ResSelector.Items.IndexOf(this.Configuration.Resolution); // We do this to not lose the Refresh Rate 
-                this.ResSelector.SelectedIndex = idx;
+                idx = this.ResSelector.Items.IndexOf(this.Configuration.Resolution); // We do this to not lose the Refresh Rate
+                this.ResSelector.SelectedIndex = idx >= 0 ? idx : 0;
 
+                this.RefreshRateSelector.ItemsSource = ((Resolution)this.ResSelector.SelectedItem).RefreshRates;
                 if (idx >= 0)
                 {
-                    this.RefreshRateSelector.ItemsSource = ((Resolution)this.ResSelector.SelectedItem).RefreshRates;
                     this.RefreshRateSelector.SelectedItem = this.Configuration.RefreshRate;
+                } 
+                else
+                {
+                    this.RefreshRateSelector.SelectedIndex = 0;
                 }
             }
             else
diff --git a/GensConfigTool/Model/Devices/GraphicsAdapter.cs b/GensConfigTool/Model/Devices/GraphicsAdapter.cs
index 75483f2..a431164 100644
--- a/GensConfigTool/Model/Devices/GraphicsAdapter.cs
+++ b/GensConfigTool/Model/Devices/GraphicsAdapter.cs
@@ -20,7 +20,7 @@ public override bool Equals(object obj)
         {
             GraphicsAdapter adapter = (GraphicsAdapter)obj;
             return Description.Equals(adapter.Description) &&
-                MonitorID.Equals(adapter.MonitorID) &&
+                Name.Equals(adapter.Name) &&
                 GUID.Equals(adapter.GUID);
         }