diff --git a/ChangeLog b/ChangeLog
index 64113fc..2f9dc34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-26 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/win32/w32_text_focus.m: Re-enable the focus in event.
+	* Source\win32\WIN32Server.m (-movewindow::, -placewindow::): Use
+	the SWP_NOACTIVATE flag to pervent window activation.
+	* Source\win32\WIN32Server.m (-setinputstate::): Set active on
+	main not key.
+
 2010-01-26 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/x11/XWindowBuffer.m (+windowBufferForWindow:depthInfo:):
diff --git a/Source/win32/WIN32Server.m b/Source/win32/WIN32Server.m
index 4f66ddf..b3c0877 100644
--- a/Source/win32/WIN32Server.m
+++ b/Source/win32/WIN32Server.m
@@ -1218,7 +1218,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg,
   p = GSWindowOriginToMS((HWND)winNum, loc);
 
   SetWindowPos((HWND)winNum, NULL, p.x, p.y, 0, 0, 
-               SWP_NOZORDER | SWP_NOSIZE);
+               SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE);
 }
 
 - (void) placewindow: (NSRect)frame : (int) winNum
@@ -1233,7 +1233,8 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg,
   GetWindowRect((HWND)winNum, &r2);
 
   SetWindowPos((HWND)winNum, NULL, 
-    r.left, r.top, r.right - r.left, r.bottom - r.top, SWP_NOZORDER); 
+               r.left, r.top, r.right - r.left, r.bottom - r.top, 
+               SWP_NOZORDER | SWP_NOACTIVATE); 
 
   if ((win->useHDC)
       && (r.right - r.left != r2.right - r2.left)
@@ -1426,7 +1427,7 @@ LRESULT CALLBACK MainWndProc(HWND hwnd, UINT uMsg,
     {
       return;
     }
-  if (state == GSTitleBarKey)
+  if (state == GSTitleBarMain)
     {
       SetActiveWindow((HWND)winNum);
     }
diff --git a/Source/win32/w32_text_focus.m b/Source/win32/w32_text_focus.m
index 8f19f79..b6cee6d 100644
--- a/Source/win32/w32_text_focus.m
+++ b/Source/win32/w32_text_focus.m
@@ -52,7 +52,6 @@
          that's too slow and allows the window state to get out of sync, 
          causing bad recursion problems */
 
-      /*
       NSEvent *ev;
       
       ev = [NSEvent otherEventWithType: NSAppKitDefined
@@ -67,7 +66,6 @@
       
       NSDebugLLog(@"Focus", @"Making %d key", (int)hwnd);
       [EVENT_WINDOW(hwnd) sendEvent: ev];
-      */
     }
     
   return 0;