diff --git a/pgadmin/frm/frmEditGrid.cpp b/pgadmin/frm/frmEditGrid.cpp
index f02f742..2e25b86 100644
--- a/pgadmin/frm/frmEditGrid.cpp
+++ b/pgadmin/frm/frmEditGrid.cpp
@@ -162,9 +162,9 @@ frmEditGrid::frmEditGrid(frmMain *form, const wxString &_title, pgConn *_conn, p
 
 	// File menu
 	fileMenu = new wxMenu();
-	fileMenu->Append(MNU_SAVE, _("&Save"), _("Save the changed row."));
+	fileMenu->Append(MNU_SAVE, _("&Save\tCtrl-S"), _("Save the changed row."));
 	fileMenu->AppendSeparator();
-	fileMenu->Append(MNU_CLOSE, _("&Close"), _("Close this window."));
+	fileMenu->Append(MNU_CLOSE, _("&Close\tCtrl-W"), _("Close this window."));
 	fileMenu->Enable(MNU_SAVE, false);
 
 	// Edit menu
@@ -222,7 +222,7 @@ frmEditGrid::frmEditGrid(frmMain *form, const wxString &_title, pgConn *_conn, p
 	SetMenuBar(menuBar);
 
 	// Accelerators
-	wxAcceleratorEntry entries[7];
+	wxAcceleratorEntry entries[8];
 
 	entries[0].Set(wxACCEL_CTRL,                (int)'S',      MNU_SAVE);
 	entries[1].Set(wxACCEL_NORMAL,              WXK_F5,        MNU_REFRESH);
@@ -231,8 +231,9 @@ frmEditGrid::frmEditGrid(frmMain *form, const wxString &_title, pgConn *_conn, p
 	entries[4].Set(wxACCEL_CTRL,                (int)'C',      MNU_COPY);
 	entries[5].Set(wxACCEL_CTRL,                (int)'V',      MNU_PASTE);
 	entries[6].Set(wxACCEL_NORMAL,              WXK_DELETE,    MNU_DELETE);
+	entries[7].Set(wxACCEL_CTRL,                (int)'W',      MNU_CLOSE);
 
-	wxAcceleratorTable accel(7, entries);
+	wxAcceleratorTable accel(8, entries);
 	SetAcceleratorTable(accel);
 	sqlGrid->SetAcceleratorTable(accel);
 
