diff --git a/OpenRA.Editor/Form1.cs b/OpenRA.Editor/Form1.cs
index 15db184da5..9df5ccff0c 100644
--- a/OpenRA.Editor/Form1.cs
+++ b/OpenRA.Editor/Form1.cs
@@ -36,6 +36,9 @@ namespace OpenRA.Editor
 			Rules.LoadRules(Game.modData.Manifest, new Map());
 
 			surface1.AfterChange += MakeDirty;
+			
+			string path = Directory.GetCurrentDirectory();
+			 Icon = new Icon(path + Path.DirectorySeparatorChar + "OpenRA.Editor" + Path.DirectorySeparatorChar + "OpenRA.Editor.Icon.ico");
 		}
 
 		void MakeDirty() { dirty = true; }
@@ -420,4 +423,4 @@ namespace OpenRA.Editor
             catch { }
         }
 	}
-}
\ No newline at end of file
+}