diff --git a/src/Eto.Wpf/Forms/WpfWindow.cs b/src/Eto.Wpf/Forms/WpfWindow.cs
index 8b165ee379..2471069886 100755
--- a/src/Eto.Wpf/Forms/WpfWindow.cs
+++ b/src/Eto.Wpf/Forms/WpfWindow.cs
@@ -147,7 +147,7 @@ private void Control_SourceInitialized(object sender, EventArgs e)
 			
 			if (WindowStyle == WindowStyle.None)
 			{
-				SetWindowChrome(true);
+				SetWindowChrome(Resizable);
 			}
 			
 			if (!Minimizable || !Maximizable)
@@ -503,6 +503,7 @@ public virtual bool Resizable
 				if (Widget.Properties.TrySet(WpfWindow.Resizable_Key, value, true))
 				{
 					SetResizeMode();
+					SetWindowChrome(WindowStyle == WindowStyle.None && value);
 				}
 			}
 		}
@@ -880,7 +881,7 @@ public WindowStyle WindowStyle
 				if (WindowStyle != value)
 				{
 					Control.WindowStyle = value.ToWpf();
-					SetWindowChrome(value == WindowStyle.None);
+					SetWindowChrome(value == WindowStyle.None && Resizable);
 				}
 			}
 		}