diff --git a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
index 42f67a40b51..d70e56d0986 100644
--- a/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
+++ b/Microsoft.Toolkit.Uwp.UI.Controls.DataGrid/DataGrid/DataGridComboBoxColumn.cs
@@ -383,7 +383,13 @@ protected override void CancelCellEdit(FrameworkElement editingElement, object u
/// The unedited value.
protected override object PrepareCellForEdit(FrameworkElement editingElement, RoutedEventArgs editingEventArgs)
{
- return (editingElement as ComboBox)?.SelectedItem;
+ if(editingElement is ComboBox comboBox)
+ {
+ comboBox.IsDropDownOpen = true;
+ return comboBox.SelectedItem;
+ }
+
+ return null;
}
///