diff --git a/gx/gui/menu.c b/gx/gui/menu.c
index 609a83f..082934f 100644
--- a/gx/gui/menu.c
+++ b/gx/gui/menu.c
@@ -3,7 +3,7 @@
  *
  *  Genesis Plus GX menu
  *
- *  Copyright Eke-Eke (2009-2017)
+ *  Copyright Eke-Eke (2009-2018)
  *
  *  Redistribution and use of this code or any derivative works are permitted
  *  provided that the following conditions are met:
@@ -2859,7 +2859,8 @@ static void ctrlmenu(void)
               if (exp == WPAD_EXP_CLASSIC)
               {
                 WPADData *data = WPAD_Data(config.input[player].port);
-                exp = data->exp.classic.rjs.max.x;
+                if (data->exp.classic.type == 2)
+                  exp = 255;
               }
 
               /* try next port if no wimote available */
diff --git a/gx/gui/menu.h b/gx/gui/menu.h
index dbd14be..a585ba6 100644
--- a/gx/gui/menu.h
+++ b/gx/gui/menu.h
@@ -3,7 +3,7 @@
  *
  *  Genesis Plus GX menus
  *
- *  Copyright Eke-Eke (2009-2017)
+ *  Copyright Eke-Eke (2009-2018)
  *
  *  Redistribution and use of this code or any derivative works are permitted
  *  provided that the following conditions are met:
diff --git a/gx/gx_input.c b/gx/gx_input.c
index 1d85bd7..e5a1747 100644
--- a/gx/gx_input.c
+++ b/gx/gx_input.c
@@ -3,7 +3,7 @@
  *
  *  Genesis Plus GX input support
  *
- *  Copyright Eke-Eke (2007-2017)
+ *  Copyright Eke-Eke (2007-2018)
  *
  *  Redistribution and use of this code or any derivative works are permitted
  *  provided that the following conditions are met:
@@ -1284,7 +1284,7 @@ int gx_input_FindDevices(void)
           if (wpad == WPAD_EXP_CLASSIC)
           {
             WPADData *data = WPAD_Data(config.input[player].port);
-            if (data->exp.classic.rjs.max.x != 255)
+            if (data->exp.classic.type != 2)
             {
               found++;
             }
@@ -1453,11 +1453,12 @@ void gx_input_SetDefault(void)
         {
           /* make sure this is not a Wii U Pro Controller */
           WPADData *data = WPAD_Data(config.input[j].port);
-          if (data->exp.classic.rjs.max.x != 255)
+          if (data->exp.classic.type != 2)
           {
             /* Wiimote is available */
             config.input[i].device = 1;
             config.input[i].port = j;
+            break;
           }
         }
       }
diff --git a/gx/gx_input.h b/gx/gx_input.h
index eaf9751..0417ab1 100644
--- a/gx/gx_input.h
+++ b/gx/gx_input.h
@@ -3,7 +3,7 @@
  *
  *  Genesis Plus GX input support
  *
- *  Copyright Eke-Eke (2007-2017)
+ *  Copyright Eke-Eke (2007-2018)
  *
  *  Redistribution and use of this code or any derivative works are permitted
  *  provided that the following conditions are met: