diff --git a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
index 324ec878a8..ca53aa80f3 100644
--- a/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
+++ b/Source/Core/DiscIO/Src/VolumeWiiCrypted.cpp
@@ -173,7 +173,7 @@ IVolume::ECountry CVolumeWiiCrypted::GetCountry() const
 			break; // SDK
 
 		default:
-			PanicAlert(StringFromFormat("Unknown Country Code!").c_str());
+			PanicAlert("Unknown Country Code!");
 			break;
 	}
 
diff --git a/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp b/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
index 5b567d4c9b..f3e3eeede5 100644
--- a/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
+++ b/Source/Plugins/Plugin_PadSimple/Src/GUI/ConfigDlg.cpp
@@ -76,6 +76,11 @@ ConfigDialog::ConfigDialog(wxWindow *parent, wxWindowID id, const wxString &titl
 	ClickedButton = NULL;
 	CreateGUIControls();
 	Fit();
+
+	// Connect keydown to the window
+	wxTheApp->Connect(wxID_ANY, wxEVT_KEY_DOWN,
+		wxKeyEventHandler(ConfigDialog::OnKeyDown),
+		(wxObject*)NULL, this);
 }
 
 ConfigDialog::~ConfigDialog()
@@ -376,10 +381,7 @@ void ConfigDialog::OnButtonClick(wxCommandEvent& event)
 	oldLabel = ClickedButton->GetLabel();
 	ClickedButton->SetLabel(_("Press Key"));
 
-	// Connect EVT_KEY_DOWN to OnKeyDown()
-    ClickedButton->Connect(wxID_ANY, wxEVT_KEY_DOWN,
-                           wxKeyEventHandler(ConfigDialog::OnKeyDown),
-                           (wxObject*)NULL, this);
+	ClickedButton->SetWindowStyle(wxWANTS_CHARS);
 }
 
 void ConfigDialog::OnCloseClick(wxCommandEvent& event)