diff --git a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
index 9a064b0cc9..79ea3d5bf1 100644
--- a/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
+++ b/src/MahApps.Metro.Samples/MahApps.Metro.Demo/ExampleViews/DataGridExamples.xaml
@@ -5,6 +5,7 @@
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:MetroDemo"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:models="clr-namespace:MetroDemo.Models"
              xmlns:vc="clr-namespace:MetroDemo.ValueConverter"
              d:DataContext="{d:DesignInstance local:MainWindowViewModel}"
              d:DesignHeight="600"
@@ -196,10 +197,12 @@
                                         EditingElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Win10}"
                                         ElementStyle="{DynamicResource MahApps.Styles.CheckBox.DataGrid.Win10}"
                                         Header="Album Selected" />
-                <DataGridTextColumn Binding="{Binding Title}"
-                                    EditingElementStyle="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing.Custom}"
-                                    Header="Title" />
+                <DataGridTextColumn Binding="{Binding Title}" Header="Title" />
                 <DataGridTextColumn Binding="{Binding Artist.Name}" Header="Artist" />
+                <DataGridComboBoxColumn DisplayMemberPath="Name"
+                                        Header="Artist"
+                                        ItemsSource="{x:Static models:SampleData.Artists}"
+                                        SelectedItemBinding="{Binding Artist}" />
                 <DataGridTextColumn Binding="{Binding Genre.Name}" Header="Genre" />
                 <controls:DataGridNumericUpDownColumn Binding="{Binding Price}"
                                                       Header="Price"
diff --git a/src/MahApps.Metro/Controls/Helper/DataGridColumnStylesHelperExtension.cs b/src/MahApps.Metro/Controls/Helper/DataGridColumnStylesHelperExtension.cs
index dde551ccfb..c5d3636092 100644
--- a/src/MahApps.Metro/Controls/Helper/DataGridColumnStylesHelperExtension.cs
+++ b/src/MahApps.Metro/Controls/Helper/DataGridColumnStylesHelperExtension.cs
@@ -85,8 +85,8 @@ protected virtual void BindColumnStyles(DataGridColumn column)
                     SetBinding(checkBoxColumn, DataGridBoundColumn.EditingElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedCheckBoxColumnEditingStyleProperty);
                     break;
                 case DataGridComboBoxColumn comboBoxColumn:
-                    // SetBinding(comboBoxColumn, DataGridComboBoxColumn.ElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedComboBoxColumnStyleProperty);
-                    // SetBinding(comboBoxColumn, DataGridComboBoxColumn.EditingElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedComboBoxColumnEditingStyleProperty);
+                    SetBinding(comboBoxColumn, DataGridComboBoxColumn.ElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedComboBoxColumnStyleProperty);
+                    SetBinding(comboBoxColumn, DataGridComboBoxColumn.EditingElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedComboBoxColumnEditingStyleProperty);
                     break;
                 case DataGridHyperlinkColumn hyperlinkColumn:
                     // SetBinding(hyperlinkColumn, DataGridHyperlinkColumn.ElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedHyperlinkColumnStyleProperty);
@@ -108,8 +108,8 @@ protected virtual void ClearColumnStyles(DataGridColumn column)
                     ClearBinding(checkBoxColumn, DataGridBoundColumn.EditingElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedCheckBoxColumnEditingStyleProperty);
                     break;
                 case DataGridComboBoxColumn comboBoxColumn:
-                    // ClearBinding(comboBoxColumn, DataGridComboBoxColumn.ElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedComboBoxColumnStyleProperty);
-                    // ClearBinding(comboBoxColumn, DataGridComboBoxColumn.EditingElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedComboBoxColumnEditingStyleProperty);
+                    ClearBinding(comboBoxColumn, DataGridComboBoxColumn.ElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedComboBoxColumnStyleProperty);
+                    ClearBinding(comboBoxColumn, DataGridComboBoxColumn.EditingElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedComboBoxColumnEditingStyleProperty);
                     break;
                 case DataGridHyperlinkColumn hyperlinkColumn:
                     // ClearBinding(hyperlinkColumn, DataGridHyperlinkColumn.ElementStyleProperty, this.dataGrid, DataGridHelper.AutoGeneratedHyperlinkColumnStyleProperty);
diff --git a/src/MahApps.Metro/Controls/Helper/DataGridHelper.cs b/src/MahApps.Metro/Controls/Helper/DataGridHelper.cs
index 8f325e7145..97bdde846f 100644
--- a/src/MahApps.Metro/Controls/Helper/DataGridHelper.cs
+++ b/src/MahApps.Metro/Controls/Helper/DataGridHelper.cs
@@ -13,6 +13,11 @@ public static class DataGridHelper
     {
         private static DataGrid _suppressComboAutoDropDown;
 
+        /// <summary>
+        /// The DependencyProperty for the <see cref="DataGrid"/>' AutoGeneratedCheckBoxColumnStyle property.
+        ///
+        /// If a style is set, the DataGridCheckBoxColumn of the DataGrid will use this style for normal cells.
+        /// </summary>
         public static readonly DependencyProperty AutoGeneratedCheckBoxColumnStyleProperty
             = DependencyProperty.RegisterAttached("AutoGeneratedCheckBoxColumnStyle",
                                                   typeof(Style),
@@ -20,8 +25,12 @@ public static readonly DependencyProperty AutoGeneratedCheckBoxColumnStyleProper
                                                   new PropertyMetadata(default(Style)));
 
         /// <summary>
-        /// Gets the ElementStyle for the autogenerated DataGridCheckBoxColumn.
+        /// Helper for getting <see cref="AutoGeneratedCheckBoxColumnStyleProperty"/> from <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridCheckBoxColumn of the DataGrid will use this style for normal cells.
         /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to read <see cref="AutoGeneratedCheckBoxColumnStyleProperty"/> from.</param>
+        /// <returns>AutoGeneratedCheckBoxColumnStyle property value.</returns>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static Style GetAutoGeneratedCheckBoxColumnStyle(UIElement element)
@@ -30,8 +39,12 @@ public static Style GetAutoGeneratedCheckBoxColumnStyle(UIElement element)
         }
 
         /// <summary>
-        /// Sets the ElementStyle for the autogenerated DataGridCheckBoxColumn.
+        /// Helper for setting <see cref="AutoGeneratedCheckBoxColumnStyleProperty"/> on <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridCheckBoxColumn of the DataGrid will use this style for normal cells.
         /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to set <see cref="AutoGeneratedCheckBoxColumnStyleProperty"/> on.</param>
+        /// <param name="value">AutoGeneratedCheckBoxColumnStyle property value.</param>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static void SetAutoGeneratedCheckBoxColumnStyle(UIElement element, Style value)
@@ -39,6 +52,11 @@ public static void SetAutoGeneratedCheckBoxColumnStyle(UIElement element, Style
             element.SetValue(AutoGeneratedCheckBoxColumnStyleProperty, value);
         }
 
+        /// <summary>
+        /// The DependencyProperty for the <see cref="DataGrid"/>' AutoGeneratedCheckBoxColumnEditingStyle property.
+        ///
+        /// If a style is set, the DataGridCheckBoxColumn of the DataGrid will use this style for cells in edit mode.
+        /// </summary>
         public static readonly DependencyProperty AutoGeneratedCheckBoxColumnEditingStyleProperty
             = DependencyProperty.RegisterAttached("AutoGeneratedCheckBoxColumnEditingStyle",
                                                   typeof(Style),
@@ -46,8 +64,12 @@ public static readonly DependencyProperty AutoGeneratedCheckBoxColumnEditingStyl
                                                   new PropertyMetadata(default(Style)));
 
         /// <summary>
-        /// Gets the EditingElementStyle for the autogenerated DataGridCheckBoxColumn.
+        /// Helper for getting <see cref="AutoGeneratedCheckBoxColumnEditingStyleProperty"/> from <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridCheckBoxColumn of the DataGrid will use this style for cells in edit mode.
         /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to read <see cref="AutoGeneratedCheckBoxColumnEditingStyleProperty"/> from.</param>
+        /// <returns>AutoGeneratedCheckBoxColumnEditingStyle property value.</returns>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static Style GetAutoGeneratedCheckBoxColumnEditingStyle(UIElement element)
@@ -56,8 +78,12 @@ public static Style GetAutoGeneratedCheckBoxColumnEditingStyle(UIElement element
         }
 
         /// <summary>
-        /// Sets the EditingElementStyle for the autogenerated DataGridCheckBoxColumn.
+        /// Helper for setting <see cref="AutoGeneratedCheckBoxColumnEditingStyleProperty"/> on <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridCheckBoxColumn of the DataGrid will use this style for cells in edit mode.
         /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to set <see cref="AutoGeneratedCheckBoxColumnEditingStyleProperty"/> on.</param>
+        /// <param name="value">AutoGeneratedCheckBoxColumnEditingStyle property value.</param>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static void SetAutoGeneratedCheckBoxColumnEditingStyle(UIElement element, Style value)
@@ -65,6 +91,11 @@ public static void SetAutoGeneratedCheckBoxColumnEditingStyle(UIElement element,
             element.SetValue(AutoGeneratedCheckBoxColumnEditingStyleProperty, value);
         }
 
+        /// <summary>
+        /// The DependencyProperty for the <see cref="DataGrid"/>' AutoGeneratedTextColumnStyle property.
+        ///
+        /// If a style is set, the DataGridTextColumn columns of the DataGrid will use this style for normal cells.
+        /// </summary>
         public static readonly DependencyProperty AutoGeneratedTextColumnStyleProperty
             = DependencyProperty.RegisterAttached("AutoGeneratedTextColumnStyle",
                                                   typeof(Style),
@@ -72,8 +103,12 @@ public static readonly DependencyProperty AutoGeneratedTextColumnStyleProperty
                                                   new PropertyMetadata(default(Style)));
 
         /// <summary>
-        /// Gets the ElementStyle for the autogenerated DataGridTextColumn.
+        /// Helper for getting <see cref="AutoGeneratedTextColumnStyleProperty"/> from <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridTextColumn columns of the DataGrid will use this style for normal cells.
         /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to read <see cref="AutoGeneratedTextColumnStyleProperty"/> from.</param>
+        /// <returns>AutoGeneratedTextColumnStyle property value.</returns>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static Style GetAutoGeneratedTextColumnStyle(UIElement element)
@@ -82,8 +117,12 @@ public static Style GetAutoGeneratedTextColumnStyle(UIElement element)
         }
 
         /// <summary>
-        /// Sets the ElementStyle for the autogenerated DataGridTextColumn.
+        /// Helper for setting <see cref="AutoGeneratedTextColumnStyleProperty"/> on <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridTextColumn columns of the DataGrid will use this style for normal cells.
         /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to set <see cref="AutoGeneratedTextColumnStyleProperty"/> on.</param>
+        /// <param name="value">AutoGeneratedTextColumnStyle property value.</param>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static void SetAutoGeneratedTextColumnStyle(UIElement element, Style value)
@@ -91,6 +130,11 @@ public static void SetAutoGeneratedTextColumnStyle(UIElement element, Style valu
             element.SetValue(AutoGeneratedTextColumnStyleProperty, value);
         }
 
+        /// <summary>
+        /// The DependencyProperty for the <see cref="DataGrid"/>' AutoGeneratedTextColumnEditingStyle property.
+        ///
+        /// If a style is set, the DataGridTextColumn of the DataGrid will use this style for cells in edit mode.
+        /// </summary>
         public static readonly DependencyProperty AutoGeneratedTextColumnEditingStyleProperty
             = DependencyProperty.RegisterAttached("AutoGeneratedTextColumnEditingStyle",
                                                   typeof(Style),
@@ -98,8 +142,12 @@ public static readonly DependencyProperty AutoGeneratedTextColumnEditingStylePro
                                                   new PropertyMetadata(default(Style)));
 
         /// <summary>
-        /// Gets the EditingElementStyle for the autogenerated DataGridTextColumn.
+        /// Helper for getting <see cref="AutoGeneratedTextColumnEditingStyleProperty"/> from <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridTextColumn of the DataGrid will use this style for cells in edit mode.
         /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to read <see cref="AutoGeneratedTextColumnEditingStyleProperty"/> from.</param>
+        /// <returns>AutoGeneratedTextColumnEditingStyle property value.</returns>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static Style GetAutoGeneratedTextColumnEditingStyle(UIElement element)
@@ -108,8 +156,12 @@ public static Style GetAutoGeneratedTextColumnEditingStyle(UIElement element)
         }
 
         /// <summary>
-        /// Sets the EditingElementStyle for the autogenerated DataGridTextColumn.
+        /// Helper for setting <see cref="AutoGeneratedTextColumnEditingStyleProperty"/> on <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridTextColumn of the DataGrid will use this style for cells in edit mode.
         /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to set <see cref="AutoGeneratedTextColumnEditingStyleProperty"/> on.</param>
+        /// <param name="value">AutoGeneratedTextColumnEditingStyle property value.</param>
         [Category(AppName.MahApps)]
         [AttachedPropertyBrowsableForType(typeof(DataGrid))]
         public static void SetAutoGeneratedTextColumnEditingStyle(UIElement element, Style value)
@@ -117,6 +169,84 @@ public static void SetAutoGeneratedTextColumnEditingStyle(UIElement element, Sty
             element.SetValue(AutoGeneratedTextColumnEditingStyleProperty, value);
         }
 
+        /// <summary>
+        /// The DependencyProperty for the <see cref="DataGrid"/>' AutoGeneratedComboBoxColumnStyle property.
+        ///
+        /// If a style is set, the DataGridComboBoxColumn columns of the DataGrid will use this style for normal cells.
+        /// </summary>
+        public static readonly DependencyProperty AutoGeneratedComboBoxColumnStyleProperty
+            = DependencyProperty.RegisterAttached("AutoGeneratedComboBoxColumnStyle",
+                                                  typeof(Style),
+                                                  typeof(DataGridHelper),
+                                                  new PropertyMetadata(default(Style)));
+
+        /// <summary>
+        /// Helper for getting <see cref="AutoGeneratedComboBoxColumnStyleProperty"/> from <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridComboBoxColumn columns of the DataGrid will use this style for normal cells.
+        /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to read <see cref="AutoGeneratedComboBoxColumnStyleProperty"/> from.</param>
+        /// <returns>AutoGeneratedComboBoxColumnStyle property value.</returns>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(DataGrid))]
+        public static Style GetAutoGeneratedComboBoxColumnStyle(UIElement element)
+        {
+            return (Style)element.GetValue(AutoGeneratedComboBoxColumnStyleProperty);
+        }
+
+        /// <summary>
+        /// Helper for setting <see cref="AutoGeneratedComboBoxColumnStyleProperty"/> on <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridComboBoxColumn columns of the DataGrid will use this style for normal cells.
+        /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to set <see cref="AutoGeneratedComboBoxColumnStyleProperty"/> on.</param>
+        /// <param name="value">AutoGeneratedComboBoxColumnStyle property value.</param>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(DataGrid))]
+        public static void SetAutoGeneratedComboBoxColumnStyle(UIElement element, Style value)
+        {
+            element.SetValue(AutoGeneratedComboBoxColumnStyleProperty, value);
+        }
+
+        /// <summary>
+        /// The DependencyProperty for the <see cref="DataGrid"/>' AutoGeneratedComboBoxColumnEditingStyle property.
+        ///
+        /// If a style is set, the DataGridComboBoxColumn of the DataGrid will use this style for cells in edit mode.
+        /// </summary>
+        public static readonly DependencyProperty AutoGeneratedComboBoxColumnEditingStyleProperty
+            = DependencyProperty.RegisterAttached("AutoGeneratedComboBoxColumnEditingStyle",
+                                                  typeof(Style),
+                                                  typeof(DataGridHelper),
+                                                  new PropertyMetadata(default(Style)));
+
+        /// <summary>
+        /// Helper for getting <see cref="AutoGeneratedComboBoxColumnEditingStyleProperty"/> from <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridComboBoxColumn of the DataGrid will use this style for cells in edit mode.
+        /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to read <see cref="AutoGeneratedComboBoxColumnEditingStyleProperty"/> from.</param>
+        /// <returns>AutoGeneratedComboBoxColumnEditingStyle property value.</returns>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(DataGrid))]
+        public static Style GetAutoGeneratedComboBoxColumnEditingStyle(UIElement element)
+        {
+            return (Style)element.GetValue(AutoGeneratedComboBoxColumnEditingStyleProperty);
+        }
+
+        /// <summary>
+        /// Helper for setting <see cref="AutoGeneratedComboBoxColumnEditingStyleProperty"/> on <paramref name="element"/>.
+        ///
+        /// If a style is set, the DataGridComboBoxColumn of the DataGrid will use this style for cells in edit mode.
+        /// </summary>
+        /// <param name="element"><see cref="UIElement"/> to set <see cref="AutoGeneratedComboBoxColumnEditingStyleProperty"/> on.</param>
+        /// <param name="value">AutoGeneratedComboBoxColumnEditingStyle property value.</param>
+        [Category(AppName.MahApps)]
+        [AttachedPropertyBrowsableForType(typeof(DataGrid))]
+        public static void SetAutoGeneratedComboBoxColumnEditingStyle(UIElement element, Style value)
+        {
+            element.SetValue(AutoGeneratedComboBoxColumnEditingStyleProperty, value);
+        }
+
         public static readonly DependencyProperty CellPaddingProperty
             = DependencyProperty.RegisterAttached("CellPadding",
                                                   typeof(Thickness),
diff --git a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
index d9fe27debe..9dc08d1a26 100644
--- a/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
+++ b/src/MahApps.Metro/Styles/Controls.DataGrid.xaml
@@ -54,6 +54,32 @@
         </Style.Triggers>
     </Style>
 
+    <Style x:Key="MahApps.Styles.ComboBox.DataGrid"
+           BasedOn="{StaticResource MahApps.Styles.ComboBox}"
+           TargetType="{x:Type ComboBox}">
+        <Setter Property="Foreground" Value="{Binding RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type DataGridCell}}, Path=Foreground, Mode=OneWay}" />
+        <Setter Property="HorizontalAlignment" Value="Stretch" />
+        <Setter Property="Margin" Value="0" />
+        <Setter Property="MinHeight" Value="22" />
+        <Setter Property="Padding" Value="4 0" />
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="{x:Type ComboBox}">
+                    <ContentPresenter Margin="{TemplateBinding Padding}"
+                                      HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                                      Content="{TemplateBinding SelectionBoxItem}"
+                                      ContentStringFormat="{TemplateBinding SelectionBoxItemStringFormat}"
+                                      ContentTemplate="{TemplateBinding SelectionBoxItemTemplate}"
+                                      ContentTemplateSelector="{TemplateBinding ItemTemplateSelector}"
+                                      IsHitTestVisible="false"
+                                      SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="VerticalAlignment" Value="Stretch" />
+    </Style>
+
     <Style x:Key="MahApps.Styles.ComboBox.DataGrid.Editing"
            BasedOn="{StaticResource MahApps.Styles.ComboBox.Virtualized}"
            TargetType="{x:Type ComboBox}">
@@ -61,6 +87,7 @@
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="Margin" Value="0" />
         <Setter Property="MinHeight" Value="22" />
+        <Setter Property="Padding" Value="3 0" />
         <Setter Property="VerticalAlignment" Value="Stretch" />
         <Setter Property="mah:ControlsHelper.CornerRadius" Value="0" />
         <Style.Triggers>
@@ -704,13 +731,12 @@
             </Setter.Value>
         </Setter>
         <Setter Property="VerticalGridLinesBrush" Value="{DynamicResource MahApps.Brushes.Gray7}" />
-
         <Setter Property="mah:DataGridHelper.AutoGeneratedCheckBoxColumnEditingStyle" Value="{StaticResource MahApps.Styles.CheckBox.DataGrid}" />
         <Setter Property="mah:DataGridHelper.AutoGeneratedCheckBoxColumnStyle" Value="{StaticResource MahApps.Styles.CheckBox.DataGrid}" />
-
+        <Setter Property="mah:DataGridHelper.AutoGeneratedComboBoxColumnEditingStyle" Value="{StaticResource MahApps.Styles.ComboBox.DataGrid.Editing}" />
+        <Setter Property="mah:DataGridHelper.AutoGeneratedComboBoxColumnStyle" Value="{StaticResource MahApps.Styles.ComboBox.DataGrid}" />
         <Setter Property="mah:DataGridHelper.AutoGeneratedTextColumnEditingStyle" Value="{StaticResource MahApps.Styles.TextBox.DataGrid.Editing}" />
         <Setter Property="mah:DataGridHelper.AutoGeneratedTextColumnStyle" Value="{StaticResource MahApps.Styles.TextBlock.DataGrid}" />
-
         <Setter Property="mah:DataGridHelper.ColumnStylesHelper" Value="{mah:DataGridColumnStylesHelper}" />
         <Style.Triggers>
             <MultiTrigger>