diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
index 879b6b57..f2c09b53 100644
--- a/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
+++ b/CSharp/Libraries/UniversalEditor.UserInterface/Engine.cs
@@ -133,8 +133,8 @@ namespace UniversalEditor.UserInterface
             AttachCommandEventHandler("ViewFullScreen", delegate(object sender, EventArgs e)
             {
                 Command cmd = (sender as Command);
-                HostApplication.CurrentWindow.FullScreen = !HostApplication.CurrentWindow.FullScreen;
-                cmd.Checked = HostApplication.CurrentWindow.FullScreen;
+                LastWindow.FullScreen = !LastWindow.FullScreen;
+                cmd.Checked = LastWindow.FullScreen;
             });
             #endregion
             #region Tools