diff --git a/Fluent/Controls/RibbonWindow.cs b/Fluent/Controls/RibbonWindow.cs
index 9920e0637..36e21dcc5 100644
--- a/Fluent/Controls/RibbonWindow.cs
+++ b/Fluent/Controls/RibbonWindow.cs
@@ -12,6 +12,7 @@ namespace Fluent
     using System;
     using System.Diagnostics.CodeAnalysis;
     using System.Windows;
+    using System.Windows.Controls;
     using System.Windows.Input;
     using System.Windows.Interop;
     using System.Windows.Media;
@@ -28,10 +29,12 @@ namespace Fluent
     /// </summary>
     [SuppressMessage("Microsoft.Design", "CA1049")]
     [TemplatePart(Name = PART_Icon, Type = typeof(UIElement))]
+    [TemplatePart(Name = PART_ContentPresenter, Type = typeof(UIElement))]
     [TemplatePart(Name = PART_WindowCommands, Type = typeof(WindowCommands))]
     public class RibbonWindow : Window
     {
         private const string PART_Icon = "PART_Icon";
+        private const string PART_ContentPresenter = "PART_ContentPresenter";
         private const string PART_WindowCommands = "PART_WindowCommands";
 
         private FrameworkElement iconImage;
@@ -380,13 +383,6 @@ public override void OnApplyTemplate()
                 this.WindowCommands = new WindowCommands();
             }
 
-            var partWindowCommands = this.GetTemplateChild(PART_WindowCommands) as UIElement;
-
-            if (partWindowCommands != null)
-            {
-                WindowChrome.SetIsHitTestVisibleInChrome(partWindowCommands, true);
-            }
-
             this.iconImage = this.GetTemplateChild(PART_Icon) as FrameworkElement;
 
             if (this.iconImage != null)
@@ -396,6 +392,20 @@ public override void OnApplyTemplate()
                 this.iconImage.MouseUp += this.HandleIconMouseUp;
             }
 
+            var partContentPresenter = this.GetTemplateChild(PART_ContentPresenter) as UIElement;
+
+            if (partContentPresenter != null)
+            {
+                WindowChrome.SetIsHitTestVisibleInChrome(partContentPresenter, true);
+            }
+
+            var partWindowCommands = this.GetTemplateChild(PART_WindowCommands) as UIElement;
+
+            if (partWindowCommands != null)
+            {
+                WindowChrome.SetIsHitTestVisibleInChrome(partWindowCommands, true);
+            }
+
             // This has to be done when the theme is changed. Otherwise maximized windows have the wrong size.
             if (this.WindowState == WindowState.Maximized)
             {
diff --git a/Fluent/Themes/Office2010/RibbonWindow.xaml b/Fluent/Themes/Office2010/RibbonWindow.xaml
index 54e994780..95ca9608d 100644
--- a/Fluent/Themes/Office2010/RibbonWindow.xaml
+++ b/Fluent/Themes/Office2010/RibbonWindow.xaml
@@ -61,7 +61,7 @@
             <Image x:Name="PART_Icon" Height="16" HorizontalAlignment="Left" VerticalAlignment="Top" Source="{Binding Icon, Converter={StaticResource IconConvert}, RelativeSource={RelativeSource TemplatedParent}}" Width="16" SnapsToDevicePixels="True"
                                Visibility="{TemplateBinding IsIconVisible, Converter={StaticResource BooleanToVisibilityConverter}}" />
           </StackPanel>
-          <ContentPresenter Margin="8,1,8,8" x:Name="contentPresenter"/>
+          <ContentPresenter Margin="8,1,8,8" x:Name="PART_ContentPresenter"/>
           <ResizeGrip x:Name="PART_ResizeGrip" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"
                 VerticalAlignment="Bottom" Focusable="False" Margin="0,0,5.5,5.5" Background="Transparent"
                 Visibility="Collapsed"/>
@@ -79,7 +79,7 @@
       <Trigger Property="WindowState" Value="Maximized">
         <Setter Property="Margin" TargetName="PART_IconImage" Value="0,4,0,0"/>
         <Setter Property="Margin" TargetName="adornerDecorator" Value="0"/>
-        <Setter Property="Margin" TargetName="contentPresenter" Value="0,0,0,0"/>
+        <Setter Property="Margin" TargetName="PART_ContentPresenter" Value="0,0,0,0"/>
         <Setter Property="Margin" TargetName="rectangle" Value="15,4,0,1"/>
         <Setter Property="Margin" TargetName="rectangle1" Value="0,4,15.1,1"/>
         <Setter Property="Margin" TargetName="rectangle2" Value="50,4,50,1"/>
@@ -115,7 +115,7 @@
                 <Grid x:Name="grid" Background="{TemplateBinding Background}"/>
               </Border>
             </Border>
-            <ContentPresenter Margin="8,1,8,8" x:Name="contentPresenter"/>
+            <ContentPresenter Margin="8,1,8,8" x:Name="PART_ContentPresenter"/>
             <ResizeGrip x:Name="PART_ResizeGrip" Grid.Row="1" Grid.Column="0" HorizontalAlignment="Right"
         VerticalAlignment="Bottom" Focusable="False" Margin="0,0,5.5,5.5"
         Cursor="SizeNWSE" Visibility="Collapsed"/>
@@ -143,7 +143,7 @@
         <Setter Property="BorderThickness" TargetName="border2" Value="0,0,0,0"/>
         <Setter Property="CornerRadius" TargetName="border2" Value="0,0,0,0"/>
         <Setter Property="Margin" TargetName="PART_WindowCommands" Value="0,0,0,0"/>
-        <Setter Property="Margin" TargetName="contentPresenter" Value="0,0,0,0"/>
+        <Setter Property="Margin" TargetName="PART_ContentPresenter" Value="0,0,0,0"/>
         <Setter Property="Height" TargetName="border2" Value="54"/>
                 <Setter Property="Margin"
                         TargetName="border4"
diff --git a/Fluent/Themes/Office2013/RibbonWindow.xaml b/Fluent/Themes/Office2013/RibbonWindow.xaml
index 335f80137..44396df7c 100644
--- a/Fluent/Themes/Office2013/RibbonWindow.xaml
+++ b/Fluent/Themes/Office2013/RibbonWindow.xaml
@@ -41,7 +41,7 @@
                                           VerticalAlignment="Top"
                                           HorizontalAlignment="Right"
                                           Height="{Binding Path=(Fluent:RibbonProperties.TitleBarHeight), RelativeSource={RelativeSource Self}}" />
-                        <ContentPresenter />
+                        <ContentPresenter x:Name="PART_ContentPresenter" />
                     </Grid>
                 </AdornerDecorator>
                 <ResizeGrip x:Name="WindowResizeGrip"