diff --git a/src/lib/platform/XWindowsKeyState.h b/src/lib/platform/XWindowsKeyState.h
index f42f7ac9..f7903900 100644
--- a/src/lib/platform/XWindowsKeyState.h
+++ b/src/lib/platform/XWindowsKeyState.h
@@ -173,6 +173,6 @@ private:
 public:
     SInt32                  group() const { return m_group; }
     void                    group(const SInt32& group) { m_group = group; }
-    KeyModifierMaskList    modifierFromX() const { return m_modifierFromX; }
+    KeyModifierMaskList& modifierFromX() { return m_modifierFromX; }
 #endif
 };
diff --git a/src/test/integtests/platform/XWindowsKeyStateTests.cpp b/src/test/integtests/platform/XWindowsKeyStateTests.cpp
index 00c01273..9f6716d5 100644
--- a/src/test/integtests/platform/XWindowsKeyStateTests.cpp
+++ b/src/test/integtests/platform/XWindowsKeyStateTests.cpp
@@ -150,7 +150,6 @@ TEST_F(XWindowsKeyStateTests, pollActiveModifiers_defaultState_returnsZero)
     ASSERT_EQ(0, actual);
 }
 
-#if 0 // TODO: fix, causes sigsegv
 TEST_F(XWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCorrect)
 {
     MockKeyMap keyMap;
@@ -181,7 +180,6 @@ TEST_F(XWindowsKeyStateTests, pollActiveModifiers_shiftKeyDownThenUp_masksAreCor
     EXPECT_TRUE((modUp & KeyModifierShift) == 0)
         << "shift key still in mask - make sure no keys are being held down";
 }
-#endif
 
 TEST_F(XWindowsKeyStateTests, pollActiveGroup_defaultState_returnsZero)
 {