diff --git a/ProcessAudiobooks-UI/MainWindow.xaml.cs b/ProcessAudiobooks-UI/MainWindow.xaml.cs
index 18e80e9..1d7ad23 100644
--- a/ProcessAudiobooks-UI/MainWindow.xaml.cs
+++ b/ProcessAudiobooks-UI/MainWindow.xaml.cs
@@ -96,6 +96,8 @@ private void btnEditBook_Click(object sender, RoutedEventArgs e)
         {
             DataObjects.Audiobook audiobook = (DataObjects.Audiobook)eLvAudiobook.SelectedItem; ;
             AddAudiobookWindow audiobookWindow;
+            if (audiobook == null) //fixes crash if we try to edit without selecting something
+                return;
             do
             {
                 audiobookWindow = new AddAudiobookWindow(audiobook);