diff --git a/Ninjacrab.PersistentWindows.Solution/Common/DbKeySelect.cs b/Ninjacrab.PersistentWindows.Solution/Common/DbKeySelect.cs
index b79d4fd..e58ffb2 100644
--- a/Ninjacrab.PersistentWindows.Solution/Common/DbKeySelect.cs
+++ b/Ninjacrab.PersistentWindows.Solution/Common/DbKeySelect.cs
@@ -29,6 +29,8 @@ namespace PersistentWindows.Common
 
         private void ListLayout_SelectedIndexChanged(object sender, EventArgs e)
         {
+            if (ListLayout.SelectedItem == null)
+                return;
             selected.Text = ListLayout.SelectedItem.ToString();
         }
     }