diff --git a/win32/wsnes9x.cpp b/win32/wsnes9x.cpp
index c5be7420..d44e90cf 100644
--- a/win32/wsnes9x.cpp
+++ b/win32/wsnes9x.cpp
@@ -197,6 +197,7 @@
 #include <objidl.h>
 #include <shlwapi.h>
 #include <Shobjidl.h>
+#include <dbt.h>
 
 #include "wsnes9x.h"
 #include "win32_sound.h"
@@ -2671,7 +2672,8 @@ LRESULT CALLBACK WinProc(
 		break;
 #endif
     case WM_DEVICECHANGE:
-        S9xDetectJoypads();
+        if(wParam == DBT_DEVICEARRIVAL || wParam == DBT_DEVICEREMOVECOMPLETE)
+            S9xDetectJoypads();
         break;
     }
     return DefWindowProc (hWnd, uMsg, wParam, lParam);