diff --git a/src/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor b/src/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor
index 70c8cf81..ca8fa8de 100644
--- a/src/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor
+++ b/src/CodeBeam.MudBlazor.Extensions/Components/ComboBox/MudComboBox.razor
@@ -20,7 +20,7 @@
                                       ShowVisualiser="@((MultiSelection && SelectedValues?.Any() == true) || !Editable)" DataVisualiserStyle="min-height: 1.1876em"
                                       @bind-Value="@_searchString" Typo="@Typo"
                                       Underline="@Underline"
-                                      HasAdornmentStart="@(AdornmentStart != null)" HasAdornmentEnd="@(AdornmentEnd != null)"
+                                      HasAdornmentStart="@(AdornmentStart != null)" HasAdornmentEnd="true"
                                       Disabled="@GetDisabledState()" ReadOnly="@GetReadOnlyState()" Error="@ErrorState.Value" ErrorId="@ErrorIdState.Value"
                                       Clearable="@(Clearable && !GetReadOnlyState())" ForceClearable="@ForceClearable" OnClearButtonClick="@ClearButtonClickHandlerAsync"
                                       MaxLength="@MaxLength" @attributes="UserAttributes" OnBlur="@HandleOnBlur" ShrinkLabel="@(HasValue(ReadValue) || AdornmentStart != null || _isOpen || ShrinkLabel)">
diff --git a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/ComboboxTests.cs b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/ComboboxTests.cs
index f4cece0c..e892e384 100644
--- a/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/ComboboxTests.cs
+++ b/tests/CodeBeam.MudBlazor.Extensions.UnitTests/Components/ComboboxTests.cs
@@ -171,6 +171,18 @@ public async Task ComboBoxClearableTest()
             comp.Instance.ClearButtonClicked.Should().BeTrue();
         }
 
+        [Test]
+        public void ComboBox_OpenCloseIconTest()
+        {
+            var comp = Context.Render<ComboBoxTest1>();
+            var combobox = comp.FindComponent<MudComboBox<string>>();
+
+            combobox.FindComponents<MudIcon>().Should().ContainSingle(x => x.Instance.Icon == Icons.Material.Filled.ArrowDropDown);
+
+            combobox.Find("div.mud-input-control").Click();
+            comp.WaitForAssertion(() => combobox.FindComponents<MudIcon>().Should().ContainSingle(x => x.Instance.Icon == Icons.Material.Filled.ArrowDropUp));
+        }
+
         [Test]
         public void MultiSelect_SelectAll()
         {