diff --git a/pgadmin/frm/frmQuery.cpp b/pgadmin/frm/frmQuery.cpp
index f062256..e832fe7 100644
--- a/pgadmin/frm/frmQuery.cpp
+++ b/pgadmin/frm/frmQuery.cpp
@@ -1375,7 +1375,7 @@ void frmQuery::updateMenu(wxObject *obj)
 	if (closing)
 		return;
 
-	wxWindow *wnd = FindFocus();
+	wxWindow *wnd = currentControl();
 	if (wnd == sqlQuery || wnd == sqlResult || wnd == msgResult || wnd == msgHistory || wnd == scratchPad)
 	{
 		if (wnd == sqlQuery)