diff --git a/MahApps.Metro/Behaviours/BorderlessWindowBehavior.cs b/MahApps.Metro/Behaviours/BorderlessWindowBehavior.cs
index 8b7bdf01ba..239eed3f46 100644
--- a/MahApps.Metro/Behaviours/BorderlessWindowBehavior.cs
+++ b/MahApps.Metro/Behaviours/BorderlessWindowBehavior.cs
@@ -20,15 +20,9 @@ public class BorderlessWindowBehavior : Behavior<Window>
         private HwndSource hwndSource;
         private WindowChrome windowChrome;
         private Thickness? savedBorderThickness = null;
-        private Brush nonActiveBorderColor;
-        private Brush savedBorderBrush = null;
 
         protected override void OnAttached()
         {
-            // maybe this can change to set via window from a dependency property
-            this.nonActiveBorderColor = new SolidColorBrush(Colors.Gray);
-            this.nonActiveBorderColor.Freeze();
-
             windowChrome = new WindowChrome();
             windowChrome.ResizeBorderThickness = SystemParameters2.Current.WindowResizeBorderThickness;
             windowChrome.CaptionHeight = 0;
@@ -67,7 +61,6 @@ protected override void OnAttached()
             AssociatedObject.SourceInitialized += AssociatedObject_SourceInitialized;
             AssociatedObject.StateChanged += AssociatedObject_StateChanged;
             AssociatedObject.Activated += AssociatedObject_Activated;
-            AssociatedObject.Deactivated += AssociatedObject_Deactivated;
 
             // handle resize mode after loading the window
             System.ComponentModel.DependencyPropertyDescriptor.FromProperty(Window.ResizeModeProperty, typeof(Window))
@@ -139,7 +132,6 @@ private void Cleanup()
                 AssociatedObject.SourceInitialized -= AssociatedObject_SourceInitialized;
                 AssociatedObject.StateChanged -= AssociatedObject_StateChanged;
                 AssociatedObject.Activated -= AssociatedObject_Activated;
-                AssociatedObject.Deactivated -= AssociatedObject_Deactivated;
                 if (hwndSource != null)
                 {
                     hwndSource.RemoveHook(WindowProc);
@@ -201,22 +193,9 @@ private System.IntPtr WindowProc(System.IntPtr hwnd, int msg, System.IntPtr wPar
 
         private void AssociatedObject_Activated(object sender, EventArgs e)
         {
-            if (savedBorderBrush != null)
-            {
-                AssociatedObject.BorderBrush = savedBorderBrush;
-            }
             HandleMaximize();
         }
 
-        private void AssociatedObject_Deactivated(object sender, EventArgs e)
-        {
-            if (AssociatedObject.BorderBrush != null)
-            {
-                savedBorderBrush = AssociatedObject.BorderBrush;
-                AssociatedObject.BorderBrush = this.nonActiveBorderColor;
-            }
-        }
-
         private void AssociatedObject_StateChanged(object sender, EventArgs e)
         {
             HandleMaximize();
@@ -402,12 +381,6 @@ private void AssociatedObject_Loaded(object sender, RoutedEventArgs e)
 
             // handle resize mode
             this.HandleResizeMode(window, window.ResizeMode);
-
-            // non-active border brush
-            if (window.NonActiveBorderBrush != null)
-            {
-                this.nonActiveBorderColor = window.NonActiveBorderBrush;
-            }
         }
 
         public static readonly DependencyProperty EnableDWMDropShadowProperty = DependencyProperty.Register("EnableDWMDropShadow", typeof(bool), typeof(BorderlessWindowBehavior), new PropertyMetadata(false));
diff --git a/MahApps.Metro/Controls/MetroWindow.cs b/MahApps.Metro/Controls/MetroWindow.cs
index 2528ca7bb4..5717d8ee32 100644
--- a/MahApps.Metro/Controls/MetroWindow.cs
+++ b/MahApps.Metro/Controls/MetroWindow.cs
@@ -93,8 +93,6 @@ public class MetroWindow : Window
         private Storyboard overlayStoryboard;
         Rectangle flyoutModal;
 
-        private Brush savedTitleBarBrush = null;
-
         public static readonly RoutedEvent FlyoutsStatusChangedEvent = EventManager.RegisterRoutedEvent(
             "FlyoutsStatusChanged", RoutingStrategy.Bubble, typeof(RoutedEventHandler), typeof(MetroWindow));
 
@@ -574,22 +572,6 @@ public void HideOverlay()
         public MetroWindow()
         {
             Loaded += this.MetroWindow_Loaded;
-            Activated += MetroWindow_Activated;
-            Deactivated += MetroWindow_Deactivated;
-        }
-
-        private void MetroWindow_Activated(object sender, EventArgs e)
-        {
-            if (savedTitleBarBrush != null)
-            {
-                WindowTitleBrush = savedTitleBarBrush;
-            }
-        }
-
-        private void MetroWindow_Deactivated(object sender, EventArgs e)
-        {
-            savedTitleBarBrush = WindowTitleBrush;
-            WindowTitleBrush = NonActiveWindowTitleBrush;
         }
 
         private void MetroWindow_Loaded(object sender, RoutedEventArgs e)
diff --git a/MahApps.Metro/Themes/MetroWindow.xaml b/MahApps.Metro/Themes/MetroWindow.xaml
index 499abf1b64..300ebe27b4 100644
--- a/MahApps.Metro/Themes/MetroWindow.xaml
+++ b/MahApps.Metro/Themes/MetroWindow.xaml
@@ -192,6 +192,16 @@
             </Storyboard>
         </ControlTemplate.Resources>
         <ControlTemplate.Triggers>
+            <!-- handle active/inactive state -->
+            <Trigger Property="IsActive"
+                     Value="False">
+                <Setter TargetName="PART_WindowTitleBackground"
+                        Property="Fill"
+                        Value="{Binding Path=NonActiveWindowTitleBrush, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}" />
+                <Setter TargetName="PART_Border"
+                        Property="BorderBrush"
+                        Value="{Binding Path=NonActiveBorderBrush, Mode=OneWay, RelativeSource={RelativeSource FindAncestor, AncestorType={x:Type Controls:MetroWindow}}}" />
+            </Trigger>
             <!-- no icon and no icon content template -> collapse the icon content control -->
             <MultiTrigger>
                 <MultiTrigger.Conditions>