diff --git a/gremlin/event_handler.py b/gremlin/event_handler.py
index 4dd46e88..4f2942c8 100644
--- a/gremlin/event_handler.py
+++ b/gremlin/event_handler.py
@@ -242,6 +242,7 @@ def _joystick_handler(self, event):
                 ))
         elif event.type in [sdl2.SDL_JOYDEVICEADDED, sdl2.SDL_JOYDEVICEREMOVED]:
             self._init_joysticks()
+            util.setup_duplicate_joysticks()
             self.device_change_event.emit()
 
     def _keyboard_handler(self, event):