diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index 00f06074..0529ecf8 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -1672,6 +1672,9 @@ public:
                 if (defkeys_joystick[i].joy)
                     a.push_back(defkeys_joystick[i]);
 
+                if (extrakeys_joystick[i].joy)
+                    a.push_back(extrakeys_joystick[i]);
+
                 tc->SetValue(wxJoyKeyTextCtrl::ToString(a));
             }
         }
diff --git a/src/wx/opts.h b/src/wx/opts.h
index e24c525f..6ecca174 100644
--- a/src/wx/opts.h
+++ b/src/wx/opts.h
@@ -3,8 +3,9 @@
 
 #define NUM_KEYS 21
 extern const wxString joynames[NUM_KEYS];
-extern wxJoyKeyBinding defkeys_keyboard[NUM_KEYS]; // keyboard defaults
-extern wxJoyKeyBinding defkeys_joystick[NUM_KEYS]; // joystick defaults
+extern wxJoyKeyBinding defkeys_keyboard[NUM_KEYS];  // keyboard defaults
+extern wxJoyKeyBinding defkeys_joystick[NUM_KEYS];  // joystick defaults
+extern wxJoyKeyBinding extrakeys_joystick[NUM_KEYS];// extra joystick defaults
 
 extern struct opts_t {
     opts_t();