diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index 4b5d4e8b..0d866993 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -1095,7 +1095,6 @@ void GameArea::OnIdle(wxIdleEvent& event)
             CheckLinkConnection();
 
 #endif
-        mf->PollJoysticks();
     } else {
         was_paused = true;
 
@@ -1103,6 +1102,8 @@ void GameArea::OnIdle(wxIdleEvent& event)
             SetExtraStyle(GetExtraStyle() & ~wxWS_EX_PROCESS_IDLE);
     }
 
+    mf->PollJoysticks();
+
     if (do_rewind && emusys->emuWriteMemState) {
         if (!rewind_mem) {
             rewind_mem = (char*)malloc(NUM_REWINDS * REWIND_SIZE);