diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/HostApplication.cs b/CSharp/Libraries/UniversalEditor.UserInterface/HostApplication.cs
index 06f3b22a..34d1f5b8 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/HostApplication.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/HostApplication.cs
@@ -7,11 +7,10 @@ namespace UniversalEditor.UserInterface
 {
 	public static class HostApplication
 	{
-		private static IHostApplicationWindow mvarCurrentWindow = null;
 		/// <summary>
 		/// Gets or sets the current window of the host application.
 		/// </summary>
-		public static IHostApplicationWindow CurrentWindow { get { return mvarCurrentWindow; } set { mvarCurrentWindow = value; } }
+		public static IHostApplicationWindow CurrentWindow { get { return Engine.CurrentEngine.LastWindow; } set { Engine.CurrentEngine.LastWindow = value; } }
 
 		private static HostApplicationOutputWindow mvarOutputWindow = new HostApplicationOutputWindow();
 		/// <summary>