diff --git a/src/Eto.WinForms/Win32.cs b/src/Eto.WinForms/Win32.cs
index 372af85c1..15d73fcf5 100755
--- a/src/Eto.WinForms/Win32.cs
+++ b/src/Eto.WinForms/Win32.cs
@@ -632,5 +632,8 @@ public struct SCROLLINFO
 		
 		[DllImport("User32.dll", SetLastError = true)]
     	public static extern int SetWindowRgn(IntPtr hWnd, IntPtr hRgn, bool bRedraw);
+
+		[DllImport("kernel32.dll")]
+		public static extern void SetLastError(uint dwErrCode);
 	}
 }
diff --git a/src/Eto.Wpf/Forms/DialogHandler.cs b/src/Eto.Wpf/Forms/DialogHandler.cs
index 87187adc6..73f6f84be 100644
--- a/src/Eto.Wpf/Forms/DialogHandler.cs
+++ b/src/Eto.Wpf/Forms/DialogHandler.cs
@@ -1,6 +1,43 @@
+using System.Windows.Automation.Peers;
 using Eto.Wpf.Forms.Controls;
 namespace Eto.Wpf.Forms
 {
+	class EtoWindowAutomationPeer : WindowAutomationPeer
+	{
+		public EtoWindowAutomationPeer(sw.Window owner) : base(owner)
+		{
+		}
+
+		protected override string GetNameCore()
+		{
+			try
+			{
+				// due to windows message hooks, we can already be in error state which causes exceptions here.
+#if NET
+				Marshal.SetLastSystemError(0);
+#else
+				Win32.SetLastError(0);
+#endif
+				return base.GetNameCore();
+			}
+			catch (Win32Exception)
+			{
+				// See https://github.com/dotnet/wpf/issues/4181 and https://github.com/dotnet/wpf/pull/7345
+				// Until that fix is in, we fix it ourselves to avoid random crashes
+				return (Owner as sw.Window)?.Title ?? string.Empty;
+			}
+		}
+	}
+
+
+	public class EtoWindow : sw.Window
+	{
+		protected override AutomationPeer OnCreateAutomationPeer()
+		{
+			return new EtoWindowAutomationPeer(this);
+		}
+	}
+	
 	public class DialogHandler : WpfWindow<sw.Window, Dialog, Dialog.ICallback>, Dialog.IHandler
 	{
 		Button defaultButton;
@@ -8,7 +45,7 @@ public class DialogHandler : WpfWindow<sw.Window, Dialog, Dialog.ICallback>, Dia
 		swc.DockPanel dockMain;
 		swc.Grid gridButtons;
 
-		public DialogHandler() : this(new sw.Window()) { }
+		public DialogHandler() : this(new EtoWindow()) { }
 
 		public DialogHandler(sw.Window window)
 		{
diff --git a/src/Eto.Wpf/Forms/FormHandler.cs b/src/Eto.Wpf/Forms/FormHandler.cs
index 27458aa71..41c6169db 100644
--- a/src/Eto.Wpf/Forms/FormHandler.cs
+++ b/src/Eto.Wpf/Forms/FormHandler.cs
@@ -1,33 +1,32 @@
 namespace Eto.Wpf.Forms
 {
-	public class FormHandler : WpfWindow<sw.Window, Form, Form.ICallback>, Form.IHandler
+	public class EtoFormWindow : EtoWindow
 	{
-		public class EtoWindow : sw.Window
+		public EtoFormWindow()
 		{
+			AllowDrop = true;
+		}
 
-			public EtoWindow()
-			{
-				AllowDrop = true;
-			}
-
-			protected override void OnActivated(EventArgs e)
-			{
-				if (!Focusable)
-					return;
-				base.OnActivated(e);
-			}
+		protected override void OnActivated(EventArgs e)
+		{
+			if (!Focusable)
+				return;
+			base.OnActivated(e);
+		}
 
-			protected override void OnPreviewGotKeyboardFocus(swi.KeyboardFocusChangedEventArgs e)
+		protected override void OnPreviewGotKeyboardFocus(swi.KeyboardFocusChangedEventArgs e)
+		{
+			if (!Focusable)
 			{
-				if (!Focusable)
-				{
-					e.Handled = true;
-					return;
-				}
-				base.OnPreviewGotKeyboardFocus(e);
+				e.Handled = true;
+				return;
 			}
+			base.OnPreviewGotKeyboardFocus(e);
 		}
-
+	}
+	
+	public class FormHandler : WpfWindow<sw.Window, Form, Form.ICallback>, Form.IHandler
+	{
 		public FormHandler(sw.Window window)
 		{
 			Control = window;
@@ -35,7 +34,7 @@ public FormHandler(sw.Window window)
 
 		public FormHandler()
 		{
-			Control = new EtoWindow();
+			Control = new EtoFormWindow();
 		}
 
 		public virtual void Show()