diff --git a/src/Views/CommitDetail.axaml.cs b/src/Views/CommitDetail.axaml.cs
index 326c612d..00873a72 100644
--- a/src/Views/CommitDetail.axaml.cs
+++ b/src/Views/CommitDetail.axaml.cs
@@ -19,6 +19,11 @@ namespace SourceGit.Views {
         private void OnChangeListContextRequested(object sender, ContextRequestedEventArgs e) {
             if (DataContext is ViewModels.CommitDetail detail) {
                 var datagrid = sender as DataGrid;
+                if (datagrid.SelectedItem == null) {
+                    e.Handled = true;
+                    return;
+                }
+
                 var menu = detail.CreateChangeContextMenu(datagrid.SelectedItem as Models.Change);
                 menu.Open(datagrid);
             }