diff --git a/Fluent.Ribbon/Controls/ComboBox.cs b/Fluent.Ribbon/Controls/ComboBox.cs index 62e990b6..df32d1f4 100644 --- a/Fluent.Ribbon/Controls/ComboBox.cs +++ b/Fluent.Ribbon/Controls/ComboBox.cs @@ -658,7 +658,11 @@ protected override void OnDropDownOpened(EventArgs e) if (this.SelectedItem is not null) { - Keyboard.Focus(this.ItemContainerGenerator.ContainerOrContainerContentFromItem(this.SelectedItem)); + var selectedItemContainer = this.ItemContainerGenerator.ContainerOrContainerContentFromItem(this.SelectedItem); + if (selectedItemContainer is not null) + { + Keyboard.Focus(selectedItemContainer); + } } this.focusedElement = Keyboard.FocusedElement;