diff --git a/freeglut/freeglut/src/freeglut_joystick.c b/freeglut/freeglut/src/freeglut_joystick.c
index 82fc444..a786b4f 100644
--- a/freeglut/freeglut/src/freeglut_joystick.c
+++ b/freeglut/freeglut/src/freeglut_joystick.c
@@ -571,6 +571,7 @@ void fgJoystickPollWindow( SFG_Window* window )
     /*
      * Execute the freeglut joystick callback now
      */
+    fgSetWindow (window);
     window->Callbacks.Joystick(
         buttons,
         (int) (axes[ 0 ] * 1000.0f),