diff --git a/freeglut/freeglut/src/android/fg_main_android.c b/freeglut/freeglut/src/android/fg_main_android.c
index 7016755..acdba1f 100644
--- a/freeglut/freeglut/src/android/fg_main_android.c
+++ b/freeglut/freeglut/src/android/fg_main_android.c
@@ -330,7 +330,6 @@ void handle_cmd(struct android_app* app, int32_t cmd) {
     /* The window is being shown, get it ready. */
     LOGI("handle_cmd: APP_CMD_INIT_WINDOW %p", app->window);
     fgDisplay.pDisplay.single_native_window = app->window;
-    window->State.WorkMask |= GLUT_INIT_WORK;
     /* start|resume: glPlatformOpenWindow was waiting for Handle to be
        defined and will now continue processing */
     break;
diff --git a/freeglut/freeglut/src/android/fg_window_android.c b/freeglut/freeglut/src/android/fg_window_android.c
index 370f1dc..1b4c80f 100644
--- a/freeglut/freeglut/src/android/fg_window_android.c
+++ b/freeglut/freeglut/src/android/fg_window_android.c
@@ -64,6 +64,7 @@ void fgPlatformOpenWindow( SFG_Window* window, const char* title,
     /* fgPlatformProcessSingleEvent(); */
   }
   window->Window.Handle = fgDisplay.pDisplay.single_native_window;
+  window->State.WorkMask |= GLUT_INIT_WORK;
 
   /* Create context */
   fghChooseConfig(&window->Window.pContext.egl.Config);