diff --git a/pgadmin/frm/frmEditGrid.cpp b/pgadmin/frm/frmEditGrid.cpp
index d201fa3..ea4ef64 100644
--- a/pgadmin/frm/frmEditGrid.cpp
+++ b/pgadmin/frm/frmEditGrid.cpp
@@ -275,9 +275,15 @@ frmEditGrid::frmEditGrid(frmMain *form, const wxString &_title, pgConn *_conn, p
 		if (!orderBy.IsEmpty())
 		{
 			if (pkAscending)
+			{
+				orderBy.Replace(wxT(","), wxT(" ASC,"));
 				orderBy += wxT(" ASC");
+			}
 			else
+			{
+				orderBy.Replace(wxT(","), wxT(" DESC,"));
 				orderBy += wxT(" DESC");
+			}
 		}
 	}
 	else if (obj->GetMetaType() == PGM_VIEW)