diff --git a/src/frontend/KaizenGui.cpp b/src/frontend/KaizenGui.cpp
index 7c56581e..3f289576 100644
--- a/src/frontend/KaizenGui.cpp
+++ b/src/frontend/KaizenGui.cpp
@@ -19,15 +19,18 @@ KaizenGui::~KaizenGui() {
 void KaizenGui::QueryDevices(SDL_Event event) {
   switch (event.type) {
   case SDL_EVENT_GAMEPAD_ADDED:
-    {
+    if (!gamepad) {
       const auto index = event.gdevice.which;
 
       gamepad = SDL_OpenGamepad(index);
       info("Found controller!");
+      info("Name: {}", SDL_GetGamepadName(gamepad));
+      info("Vendor: {}", SDL_GetGamepadVendor(gamepad));
     }
     break;
   case SDL_EVENT_GAMEPAD_REMOVED:
-    SDL_CloseGamepad(gamepad);
+    if (gamepad)
+      SDL_CloseGamepad(gamepad);
     break;
   default: break;
   }