diff --git a/samples/ControlCatalog/Pages/MenuPage.xaml b/samples/ControlCatalog/Pages/MenuPage.xaml
index ca28fadea0..98171f29d6 100644
--- a/samples/ControlCatalog/Pages/MenuPage.xaml
+++ b/samples/ControlCatalog/Pages/MenuPage.xaml
@@ -10,6 +10,7 @@
       <Menu>
         <MenuItem Header="_First">
           <MenuItem Header="Standard _Menu Item"/>
+          <Separator/>
           <MenuItem Header="Menu with _Submenu">
             <MenuItem Header="Submenu _1"/>
             <MenuItem Header="Submenu _2"/>
diff --git a/src/Avalonia.Controls/Avalonia.Controls.csproj b/src/Avalonia.Controls/Avalonia.Controls.csproj
index 47a56fcc82..c181aab1e2 100644
--- a/src/Avalonia.Controls/Avalonia.Controls.csproj
+++ b/src/Avalonia.Controls/Avalonia.Controls.csproj
@@ -51,6 +51,7 @@
     <Compile Include="DockPanel.cs" />
     <Compile Include="Expander.cs" />
     <Compile Include="Generators\ItemContainerInfo.cs" />
+    <Compile Include="Generators\MenuItemContainerGenerator.cs" />
     <Compile Include="Generators\TreeContainerIndex.cs" />
     <Compile Include="HotkeyManager.cs" />
     <Compile Include="IApplicationLifecycle.cs" />
diff --git a/src/Avalonia.Controls/Generators/MenuItemContainerGenerator.cs b/src/Avalonia.Controls/Generators/MenuItemContainerGenerator.cs
new file mode 100644
index 0000000000..c9b3a55aaa
--- /dev/null
+++ b/src/Avalonia.Controls/Generators/MenuItemContainerGenerator.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Avalonia.Controls.Generators
+{
+    public class MenuItemContainerGenerator : ItemContainerGenerator<MenuItem>
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="ItemContainerGenerator{T}"/> class.
+        /// </summary>
+        /// <param name="owner">The owner control.</param>
+        public MenuItemContainerGenerator(IControl owner)
+            : base(owner, MenuItem.HeaderProperty, null)
+        {
+        }
+
+        /// <inheritdoc/>
+        protected override IControl CreateContainer(object item)
+        {
+            var separator = item as Separator;
+            return separator != null ? separator : base.CreateContainer(item);
+        }
+    }
+}
diff --git a/src/Avalonia.Controls/MenuItem.cs b/src/Avalonia.Controls/MenuItem.cs
index f73f2c755b..3d15ed99e7 100644
--- a/src/Avalonia.Controls/MenuItem.cs
+++ b/src/Avalonia.Controls/MenuItem.cs
@@ -208,7 +208,7 @@ namespace Avalonia.Controls
         /// <inheritdoc/>
         protected override IItemContainerGenerator CreateItemContainerGenerator()
         {
-            return new ItemContainerGenerator<MenuItem>(this, MenuItem.HeaderProperty, null);
+            return new MenuItemContainerGenerator(this);
         }
 
         /// <summary>