diff --git a/pcsx2/gui/FrameForGS.cpp b/pcsx2/gui/FrameForGS.cpp
index f5302b1053..54d59fadc3 100644
--- a/pcsx2/gui/FrameForGS.cpp
+++ b/pcsx2/gui/FrameForGS.cpp
@@ -409,6 +409,13 @@ void GSFrame::OnMove( wxMoveEvent& evt )
 	//lastpos = evt.GetPosition();
 }
 
+void GSFrame::SetFocus()
+{
+	_parent::SetFocus();
+	if( GSPanel* gsPanel = GetViewport() )
+		gsPanel->SetFocusFromKbd();
+}
+
 void GSFrame::OnResize( wxSizeEvent& evt )
 {
 	if( IsBeingDeleted() ) return;