diff --git a/pgadmin/ctl/ctlSQLGrid.cpp b/pgadmin/ctl/ctlSQLGrid.cpp
index 9d1a533..a217283 100644
--- a/pgadmin/ctl/ctlSQLGrid.cpp
+++ b/pgadmin/ctl/ctlSQLGrid.cpp
@@ -25,7 +25,6 @@
 #define EXTRAEXTENT_WIDTH  6
 
 BEGIN_EVENT_TABLE(ctlSQLGrid, wxGrid)
-	EVT_MENU(MNU_COPY, ctlSQLGrid::OnCopy)
 	EVT_MOUSEWHEEL(ctlSQLGrid::OnMouseWheel)
 END_EVENT_TABLE()
 
@@ -51,11 +50,6 @@ ctlSQLGrid::ctlSQLGrid(wxWindow *parent, wxWindowID id, const wxPoint &pos, cons
 	SetColLabelSize(fntLabel.GetPointSize() * 4);
 	SetDefaultCellOverflow(false);
 
-	wxAcceleratorEntry entries[1];
-	entries[0].Set(wxACCEL_CTRL,                (int)'C',      MNU_COPY);
-	wxAcceleratorTable accel(1, entries);
-	SetAcceleratorTable(accel);
-
 	Connect(wxID_ANY, wxEVT_GRID_LABEL_LEFT_DCLICK, wxGridEventHandler(ctlSQLGrid::OnLabelDoubleClick));
 }
 
diff --git a/pgadmin/frm/frmEditGrid.cpp b/pgadmin/frm/frmEditGrid.cpp
index 8df535b..2cd9327 100644
--- a/pgadmin/frm/frmEditGrid.cpp
+++ b/pgadmin/frm/frmEditGrid.cpp
@@ -732,15 +732,22 @@ void frmEditGrid::OnCopy(wxCommandEvent &ev)
 				if (sqlGrid->GetTable()->IsColText(sqlGrid->GetGridCursorCol()))
 				{
 					wxStyledTextCtrl *text = (wxStyledTextCtrl *)sqlGrid->GetCellEditor(sqlGrid->GetGridCursorRow(), sqlGrid->GetGridCursorCol())->GetControl();
-					if (text)
+					if (text && !text->GetSelectedText().IsEmpty())
+					{
 						wxTheClipboard->SetData(new wxTextDataObject(text->GetSelectedText()));
+						SetStatusText(_("Data from one cell copied to clipboard."));
+					}
 				}
 				else
 				{
 					wxTextCtrl *text = (wxTextCtrl *)sqlGrid->GetCellEditor(sqlGrid->GetGridCursorRow(), sqlGrid->GetGridCursorCol())->GetControl();
-					if (text)
+					if (text && !text->GetStringSelection().IsEmpty())
+					{
 						wxTheClipboard->SetData(new wxTextDataObject(text->GetStringSelection()));
+						SetStatusText(_("Data from one cell copied to clipboard."));
+					}
 				}
+
 				wxTheClipboard->Close();
 			}
 		}