diff --git a/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs b/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
index e27211a1ce..d4f3cda5cf 100644
--- a/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/TextBoxHelper.cs
@@ -931,11 +931,11 @@ public static void ButtonClicked(object sender, RoutedEventArgs e)
                 {
                     if (comboBox.IsEditable)
                     {
-                        comboBox.Text = string.Empty;
+                        comboBox.SetCurrentValue(ComboBox.TextProperty, string.Empty);
                         comboBox.GetBindingExpression(ComboBox.TextProperty)?.UpdateSource();
                     }
 
-                    comboBox.SelectedItem = null;
+                    comboBox.SetCurrentValue(ComboBox.SelectedItemProperty, null);
                     comboBox.GetBindingExpression(ComboBox.SelectedItemProperty)?.UpdateSource();
                 }
                 else if (parent is ColorPickerBase colorPicker)
@@ -1020,4 +1020,4 @@ private static void ComboBoxLoaded(object sender, RoutedEventArgs e)
             }
         }
     }
-}
\ No newline at end of file
+}