diff --git a/src/Eto.WinForms/Forms/WindowHandler.cs b/src/Eto.WinForms/Forms/WindowHandler.cs
index 152a67bcf..9373fe856 100755
--- a/src/Eto.WinForms/Forms/WindowHandler.cs
+++ b/src/Eto.WinForms/Forms/WindowHandler.cs
@@ -457,6 +457,11 @@ public Icon Icon
 			{
 				icon = value;
 				Control.Icon = ((IWindowsIconSource)icon.Handler).GetIcon();
+				if (!Control.ShowIcon)
+				{
+					// For dialogs we don't show an icon by default and need to enable it here
+					Control.ShowIcon = true;
+				}
 			}
 		}