diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
index a97c8f59..76b37153 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/Apps/plClient/winmain.cpp
@@ -57,6 +57,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "../plNetClient/plNetClientMgr.h"
 #include "../plNetClient/plNetLinkingMgr.h"
 #include "../plInputCore/plInputManager.h"
+#include "../plInputCore/plInputDevice.h"
 #include "../plUnifiedTime/plUnifiedTime.h"
 #include "plPipeline.h"
 #include "../plResMgr/plResManager.h"
@@ -497,6 +498,31 @@ LRESULT CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam)
             }
 			break;
 
+		case WM_SETCURSOR:
+			{
+				static bool winCursor = true;
+				if (LOWORD(lParam) == HTCLIENT)
+				{
+					if (winCursor)
+					{
+						winCursor = false;
+						ShowCursor(FALSE);
+						plMouseDevice::ShowCursor();
+					}
+				}
+				else
+				{
+					if (!winCursor)
+					{
+						winCursor = true;
+						ShowCursor(TRUE);
+						plMouseDevice::HideCursor();
+					}
+				}
+				return TRUE;
+			}
+			break;
+
         case WM_ACTIVATE:
 			{
 				bool active = (LOWORD(wParam) == WA_ACTIVE || LOWORD(wParam) == WA_CLICKACTIVE);
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
index 0b6ab68c..3e248862 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.cpp
@@ -933,26 +933,3 @@ hsBool plMouseDevice::MsgReceive(plMessage* msg)
 	return false;
 }
 
-
-
-void plMouseDevice::HandleWindowActivate(bool bActive, HWND hWnd)
-{
-	if ( bActive )
-	{
-		RECT rect;
-		::GetClientRect(hWnd,&rect);
-
-//		rect.right /= plInputManager::GetInstance()->GetMouseScale();
-//		rect.bottom /= plInputManager::GetInstance()->GetMouseScale();
-
-		::MapWindowPoints( hWnd, NULL, (POINT *)&rect, 2 );
-		::ShowCursor( FALSE );
-		SetCapture(hWnd);
-
-	}
-	else
-	{
-		ReleaseCapture();
-		::ShowCursor( TRUE );
-	}	
-}
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
index 4f8e8699..ad84837b 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputDevice.h
@@ -173,7 +173,6 @@ public:
 	~plMouseDevice();
 
 	const char* GetInputName() { return "mouse"; }
-	void HandleWindowActivate(bool bActive, HWND hWnd);
 
 	hsBool	HasControlFlag(int f) const { return fControlFlags.IsBitSet(f); }
 	void	SetControlFlag(int f) 
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
index 69c37db4..a6ce26d2 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plInputCore/plInputManager.cpp
@@ -564,8 +564,6 @@ void plDInputMgr::AddDevice(IDirectInputDevice8* device)
 void plDInputMgr::ConfigureDevice()
 {
 	::ShowCursor( TRUE );
-	ReleaseCapture();
-		
 
 	DICOLORSET dics;
     ZeroMemory(&dics, sizeof(DICOLORSET));
@@ -587,8 +585,6 @@ void plDInputMgr::ConfigureDevice()
 		fDI->fSticks[i]->fDevice->SetActionMap( fDI->fActionFormat, NULL, DIDSAM_FORCESAVE );
 
 	::ShowCursor( FALSE );
-	SetCapture(fhWnd);
-
 }
 
 hsBool plDInputMgr::MsgReceive(plMessage* msg)
diff --git a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
index 1e33ac05..49b5fffa 100644
--- a/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
+++ b/MOULOpenSourceClientPlugin/Plasma20/Sources/Plasma/PubUtilLib/plPipeline/plDXPipeline.cpp
@@ -2233,7 +2233,6 @@ hsBool plDXPipeline::IResetDevice()
 	{
 		IClearShadowSlaves();
 
-		ReleaseCapture();
 		Sleep(100);
 		HRESULT coopLev = fD3DDevice->TestCooperativeLevel();
 		if( coopLev == D3DERR_DEVICELOST )
@@ -2281,8 +2280,6 @@ hsBool plDXPipeline::IResetDevice()
 			/// all device-specific stuff needs to be recreated
 			plDeviceRecreateMsg* clean = TRACKED_NEW plDeviceRecreateMsg();
 			plgDispatch::MsgSend(clean);
-
-			SetCapture(fSettings.fHWnd);
 		}
 		fDevWasLost = true;
 		fDeviceLost = false;