diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index 16ae2485..1051ad2a 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -2932,7 +2932,7 @@ bool MainFrame::InitMore(void)
 	getdp("Recordings", gopts.recording_dir);
     }
 
-    d=LoadXRCropertySheetDialog("JoypadConfig");
+    wxPropertySheetDialog * joyDialog = LoadXRCropertySheetDialog("JoypadConfig");
     wxFarRadio *r = 0;
     for(int i = 0; i < 4; i++) {
 	wxString pn;
@@ -2943,11 +2943,9 @@ bool MainFrame::InitMore(void)
 	// "Unable to load dialog JoypadConfig from resources", this is
 	// probably the reason.
 	pn.Printf(wxT("joy%d"), i + 1);
-	wxWindow *w;
-	w=vfld(d, ToString(pn).c_str(), wxWindow);
-#define d w
+	wxWindow *w = vfld(joyDialog, ToString(pn).c_str(), wxWindow);
 	wxFarRadio *cb;
-	cb=vfld(d, "DefaultConfig", wxFarRadio);
+	cb=vfld(w, "DefaultConfig", wxFarRadio);
 	if(r)
 	    cb->SetGroup(r);
 	else
@@ -2971,7 +2969,7 @@ bool MainFrame::InitMore(void)
 	w->Connect(XRCID("Clear"), wxEVT_COMMAND_BUTTON_CLICKED,
 		   wxCommandEventHandler(JoyPadConfig_t::JoypadConfigButtons),
 		   NULL, &JoyPadConfigHandler[i]);
-#undef d
+	joyDialog->Fit();
     }
 
 #ifndef NO_LINK