diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index 99d00154a8..2167c3620e 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -166,7 +166,6 @@
     <Compile Include="Graphics\SheetBuilder.cs" />
     <Compile Include="Graphics\HardwarePalette.cs" />
     <Compile Include="MainWindow.cs">
-      <SubType>Form</SubType>
     </Compile>
     <Compile Include="Support\Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
diff --git a/OpenRa.Gl/GraphicsDevice.cs b/OpenRa.Gl/GraphicsDevice.cs
index 5afbb14536..3477ca349f 100644
--- a/OpenRa.Gl/GraphicsDevice.cs
+++ b/OpenRa.Gl/GraphicsDevice.cs
@@ -55,7 +55,9 @@ namespace OpenRa.GlRenderer
 		public GraphicsDevice( int width, int height, bool fullscreen, bool vsync )
 		{
 			Glfw.glfwInit();
-			Glfw.glfwOpenWindow( width, height, 0, 0, 0, 0, 0, 0, /*fullscreen ? Glfw.GLFW_FULLSCREEN :*/ Glfw.GLFW_WINDOW );
+			Glfw.glfwOpenWindow(width, height, 0, 0, 0, 0, 0, 0, /*fullscreen ? Glfw.GLFW_FULLSCREEN :*/ Glfw.GLFW_WINDOW);
+			Glfw.glfwSetWindowTitle("OpenRA (OpenGL version)");
+			bool initDone = false;
 			Glfw.glfwSetMouseButtonCallback( mouseButtonCallback = ( button, action ) =>
 				{
 					var b = button == Glfw.GLFW_MOUSE_BUTTON_1 ? MouseButtons.Left
@@ -65,17 +67,18 @@ namespace OpenRa.GlRenderer
 					Game.DispatchMouseInput( action == Glfw.GLFW_PRESS ? MouseInputEvent.Down : MouseInputEvent.Up,
 						new MouseEventArgs( b, action == Glfw.GLFW_PRESS ? 1 : 0, mouseX, mouseY, 0 ), 0 );
 				} );
-			//Glfw.glfwSetMousePosCallback( mousePositionCallback = ( x, y ) =>
-			//    {
-			//        mouseX = x;
-			//        mouseY = y;
-			//        Game.DispatchMouseInput( MouseInputEvent.Move, new MouseEventArgs( 0, 0, x, y, 0 ), 0 );
-			//    } );
+			Glfw.glfwSetMousePosCallback(mousePositionCallback = (x, y) =>
+				{
+					mouseX = x;
+					mouseY = y;
+					if (initDone)
+						Game.DispatchMouseInput(MouseInputEvent.Move, new MouseEventArgs(0, 0, x, y, 0), 0);
+				});
 			Glfw.glfwSetWindowCloseCallback( windowCloseCallback = () =>
 				{
 					Game.Exit();
 					Glfw.glfwIconifyWindow();
-					return Gl.GL_FALSE;
+					return Gl.GL_TRUE;
 				} );
 			CheckGlError();
 
@@ -93,6 +96,8 @@ namespace OpenRa.GlRenderer
 			CheckGlError();
 			Gl.glEnableClientState( Gl.GL_TEXTURE_COORD_ARRAY );
 			CheckGlError();
+
+			initDone = true;
 		}
 
 		static Cg.CGerrorCallbackFuncDelegate CgErrorCallback = () =>