diff --git a/client/CXWindowsSecondaryScreen.cpp b/client/CXWindowsSecondaryScreen.cpp
index ec4f5d21..2adb1a81 100644
--- a/client/CXWindowsSecondaryScreen.cpp
+++ b/client/CXWindowsSecondaryScreen.cpp
@@ -310,6 +310,7 @@ void					CXWindowsSecondaryScreen::onOpenDisplay()
 								CWDontPropagate | CWEventMask |
 								CWOverrideRedirect | CWCursor,
 								&attr);
+	log((CLOG_DEBUG "window is 0x%08x", m_window));
 
 	// become impervious to server grabs
 	XTestGrabControl(display, True);
@@ -345,14 +346,6 @@ void					CXWindowsSecondaryScreen::onLostClipboard(
 	m_client->onClipboardChanged(id);
 }
 
-long					CXWindowsSecondaryScreen::getEventMask(Window w) const
-{
-	if (w == m_window)
-		return LeaveWindowMask;
-	else
-		return NoEventMask;
-}
-
 void					CXWindowsSecondaryScreen::leaveNoLock(Display* display)
 {
 	assert(display  != NULL);
@@ -778,7 +771,7 @@ void					CXWindowsSecondaryScreen::doKeystrokes(
 unsigned int			CXWindowsSecondaryScreen::maskToX(
 								KeyModifierMask inMask) const
 {
-	// FIXME -- should be configurable.  not using Mod3Mask.
+	// FIXME -- should be configurable.  also not using Mod3Mask.
 	unsigned int outMask = 0;
 	if (inMask & KeyModifierShift)
 		outMask |= ShiftMask;
@@ -817,8 +810,17 @@ void					CXWindowsSecondaryScreen::updateKeys(Display* display)
 }
 
 void					CXWindowsSecondaryScreen::updateModifiers(
-								Display*)
+								Display* display)
 {
+	// query the pointer to get the keyboard state
+	Window root, window;
+	int xRoot, yRoot, xWindow, yWindow;
+	unsigned int state;
+	if (!XQueryPointer(display, m_window, &root, &window,
+								&xRoot, &yRoot, &xWindow, &yWindow, &state)) {
+		state = 0;
+	}
+
 	// update active modifier mask
 	m_mask = 0;
 	for (unsigned int i = 0; i < 8; ++i) {
@@ -829,8 +831,9 @@ void					CXWindowsSecondaryScreen::updateModifiers(
 					m_mask |= bit;
 			}
 		}
-		else {
-			// FIXME -- not sure how to check current lock states
+		else if ((bit & state) != 0) {
+			// toggle is on
+			m_mask |= bit;
 		}
 	}
 }
diff --git a/client/CXWindowsSecondaryScreen.h b/client/CXWindowsSecondaryScreen.h
index 52bbde1b..a89e344b 100644
--- a/client/CXWindowsSecondaryScreen.h
+++ b/client/CXWindowsSecondaryScreen.h
@@ -40,7 +40,6 @@ protected:
 						createClipboard(ClipboardID);
 	virtual void		onCloseDisplay();
 	virtual void		onLostClipboard(ClipboardID);
-	virtual long		getEventMask(Window) const;
 
 private:
 	enum EKeyAction { kPress, kRelease, kRepeat };