diff --git a/src/osgViewer/GraphicsWindowCarbon.cpp b/src/osgViewer/GraphicsWindowCarbon.cpp
index a6c68b74a..ac2c8adfb 100644
--- a/src/osgViewer/GraphicsWindowCarbon.cpp
+++ b/src/osgViewer/GraphicsWindowCarbon.cpp
@@ -974,15 +974,15 @@ bool GraphicsWindowCarbon::handleKeyboardEvent(EventRef theEvent)
         case kEventRawKeyDown:
         case kEventRawKeyRepeat:
         {
-            getEventQueue()->keyPress(keychar);
             getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
+            getEventQueue()->keyPress(keychar);
             break;
         }
         
         case kEventRawKeyUp:
         {                 
-            getEventQueue()->keyRelease(keychar);
             getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
+            getEventQueue()->keyRelease(keychar);
             break;
         }
         
diff --git a/src/osgViewer/GraphicsWindowWin32.cpp b/src/osgViewer/GraphicsWindowWin32.cpp
index 55f2220ac..7c9956b2b 100644
--- a/src/osgViewer/GraphicsWindowWin32.cpp
+++ b/src/osgViewer/GraphicsWindowWin32.cpp
@@ -1974,8 +1974,8 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
                 int keySymbol = 0;
                 unsigned int modifierMask = 0;
                 adaptKey(wParam, lParam, keySymbol, modifierMask);
-                getEventQueue()->keyPress(keySymbol, eventTime);
                 getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
+                getEventQueue()->keyPress(keySymbol, eventTime);
             }
             break;
 
@@ -1988,8 +1988,8 @@ LRESULT GraphicsWindowWin32::handleNativeWindowingEvent( HWND hwnd, UINT uMsg, W
                 int keySymbol = 0;
                 unsigned int modifierMask = 0;
                 adaptKey(wParam, lParam, keySymbol, modifierMask);
-                getEventQueue()->keyRelease(keySymbol, eventTime);
                 getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
+                getEventQueue()->keyRelease(keySymbol, eventTime);
             }
             break;
 
diff --git a/src/osgViewer/GraphicsWindowX11.cpp b/src/osgViewer/GraphicsWindowX11.cpp
index cc1763d44..fd408aafa 100644
--- a/src/osgViewer/GraphicsWindowX11.cpp
+++ b/src/osgViewer/GraphicsWindowX11.cpp
@@ -27,7 +27,7 @@
 #include <X11/cursorfont.h>
 #include <X11/Intrinsic.h>
 
-#include <X11/Xmd.h>		/* For CARD16 */
+#include <X11/Xmd.h>        /* For CARD16 */
 
 #include <unistd.h>
 
@@ -932,8 +932,8 @@ void GraphicsWindowX11::checkEvents()
                 unsigned int modifierMask = 0;
                 adaptKey(ev.xkey, keySymbol, modifierMask);
 
-                getEventQueue()->keyPress(keySymbol, eventTime);
                 getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
+                getEventQueue()->keyPress(keySymbol, eventTime);
                 break;
             }
             
@@ -947,8 +947,8 @@ void GraphicsWindowX11::checkEvents()
                 unsigned int modifierMask = 0;
                 adaptKey(ev.xkey, keySymbol, modifierMask);
                 
-                getEventQueue()->keyRelease(keySymbol, eventTime);
                 getEventQueue()->getCurrentEventState()->setModKeyMask(modifierMask);
+                getEventQueue()->keyRelease(keySymbol, eventTime);
                 break;
             }