diff --git a/src/MainDemo.Wpf/Drawers.xaml b/src/MainDemo.Wpf/Drawers.xaml
index bc0423573c..2f7f45de8e 100644
--- a/src/MainDemo.Wpf/Drawers.xaml
+++ b/src/MainDemo.Wpf/Drawers.xaml
@@ -22,6 +22,11 @@
         <TextBlock VerticalAlignment="Center" Text="Primary Overlay Background" />
       </StackPanel>
 
+      <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
+        <TextBlock VerticalAlignment="Center" Text="materialDesign:TransitionAssist.DisableTransitions" />
+        <ToggleButton x:Name="TransitionToggle" Margin="8,0,0,0" />
+      </StackPanel>
+
       <StackPanel Margin="0,8,0,0" Orientation="Horizontal">
         <TextBlock VerticalAlignment="Center" Text="Open Mode" />
         <ComboBox SelectedValue="{Binding OpenMode, ElementName=DrawerHost}" SelectedValuePath="Content">
@@ -57,6 +62,7 @@
                                  Width="480"
                                  Height="480"
                                  Margin="32"
+                                 materialDesign:TransitionAssist.DisableTransitions="{Binding ElementName=TransitionToggle, Path=IsChecked}"
                                  ApplyBlurBackground="{Binding ElementName=cbApplyBlurBackground, Path=IsChecked}"
                                  BlurRadius="{Binding ElementName=BlurRadiusSlider, Path=Value}"
                                  HorizontalAlignment="Center"
diff --git a/src/MaterialDesign3.Demo.Wpf/Drawers.xaml b/src/MaterialDesign3.Demo.Wpf/Drawers.xaml
index 1eaf7ee50a..e960c4780f 100644
--- a/src/MaterialDesign3.Demo.Wpf/Drawers.xaml
+++ b/src/MaterialDesign3.Demo.Wpf/Drawers.xaml
@@ -19,6 +19,11 @@
 
       <TextBlock VerticalAlignment="Center" Text="Primary Overlay Background" />
 
+      <StackPanel Orientation="Horizontal" Margin="30,0,0,0">
+        <TextBlock VerticalAlignment="Center" Text="materialDesign:TransitionAssist.DisableTransitions" />
+        <ToggleButton x:Name="TransitionToggle" Margin="8,0,0,0" />
+      </StackPanel>
+
       <TextBlock Margin="30,0,16,0"
                  VerticalAlignment="Center"
                  Text="Open Mode" />
@@ -35,6 +40,7 @@
                                  Width="480"
                                  Height="480"
                                  Margin="32"
+                                 materialDesign:TransitionAssist.DisableTransitions="{Binding ElementName=TransitionToggle, Path=IsChecked}"
                                  HorizontalAlignment="Center"
                                  VerticalAlignment="Center"
                                  BorderBrush="{DynamicResource MaterialDesign.Brush.TextBox.HoverBackground}"
diff --git a/src/MaterialDesignThemes.Wpf/DrawerHost.cs b/src/MaterialDesignThemes.Wpf/DrawerHost.cs
index 6c1905770b..778dfe08f0 100644
--- a/src/MaterialDesignThemes.Wpf/DrawerHost.cs
+++ b/src/MaterialDesignThemes.Wpf/DrawerHost.cs
@@ -527,8 +527,7 @@ protected void OnDrawerClosing(DrawerClosingEventArgs eventArgs)
 
     public override void OnApplyTemplate()
     {
-        if (_templateContentCoverElement != null)
-            _templateContentCoverElement.PreviewMouseLeftButtonUp += TemplateContentCoverElementOnPreviewMouseLeftButtonUp;
+        _templateContentCoverElement?.PreviewMouseLeftButtonUp += TemplateContentCoverElementOnPreviewMouseLeftButtonUp;
         WireDrawer(_leftDrawerElement, true);
         WireDrawer(_topDrawerElement, true);
         WireDrawer(_rightDrawerElement, true);
@@ -537,8 +536,7 @@ public override void OnApplyTemplate()
         base.OnApplyTemplate();
 
         _templateContentCoverElement = GetTemplateChild(TemplateContentCoverPartName) as FrameworkElement;
-        if (_templateContentCoverElement != null)
-            _templateContentCoverElement.PreviewMouseLeftButtonUp += TemplateContentCoverElementOnPreviewMouseLeftButtonUp;
+        _templateContentCoverElement?.PreviewMouseLeftButtonUp += TemplateContentCoverElementOnPreviewMouseLeftButtonUp;
         _leftDrawerElement = WireDrawer(GetTemplateChild(TemplateLeftDrawerPartName) as FrameworkElement, false);
         _topDrawerElement = WireDrawer(GetTemplateChild(TemplateTopDrawerPartName) as FrameworkElement, false);
         _rightDrawerElement = WireDrawer(GetTemplateChild(TemplateRightDrawerPartName) as FrameworkElement, false);
diff --git a/src/MaterialDesignThemes.Wpf/Themes/Generic.xaml b/src/MaterialDesignThemes.Wpf/Themes/Generic.xaml
index daddfd956f..de444e303c 100644
--- a/src/MaterialDesignThemes.Wpf/Themes/Generic.xaml
+++ b/src/MaterialDesignThemes.Wpf/Themes/Generic.xaml
@@ -670,7 +670,8 @@
                   <Storyboard>
                     <DoubleAnimation Storyboard.TargetName="PART_ContentCover"
                                      Storyboard.TargetProperty="Opacity"
-                                     To="0" />
+                                     To="0"
+                                     Duration="0" />
                     <BooleanAnimationUsingKeyFrames Storyboard.TargetName="PART_ContentCover" Storyboard.TargetProperty="IsHitTestVisible">
                       <DiscreteBooleanKeyFrame Value="False" />
                     </BooleanAnimationUsingKeyFrames>