diff --git a/dlg/dlgEventTrigger.cpp b/dlg/dlgEventTrigger.cpp
index b04cbec..7fca023 100644
--- a/dlg/dlgEventTrigger.cpp
+++ b/dlg/dlgEventTrigger.cpp
@@ -68,11 +68,13 @@ wxString dlgEventTrigger::GetSql()
 		else if (!chkEnable->GetValue())
 			sql += wxT("ALTER EVENT TRIGGER ") + qtIdent(name) + wxT(" DISABLE ;\n\n");
 	}
+	wxString tmp = eventTrigger->GetEventName().Lower();
+	tmp.Replace("_", " ");
 
 	if (!eventTrigger ||
 	        (
 	            cbFunction->GetValue() != (eventTrigger->GetFunction()) ||
-	            rdbEvents->GetStringSelection().Lower() != (eventTrigger->GetEventName().Lower()) ||
+	            rdbEvents->GetStringSelection().Lower() != (tmp) ||
 	            txtWhen->GetValue() != (eventTrigger->GetWhen())
 	        )
 	   )
@@ -144,9 +146,9 @@ int dlgEventTrigger::Go(bool modal)
 		else
 			rdbEnableStatus->Disable();
 
-		if(eventTrigger->GetEventName().Lower() == wxT("ddl command start"))
+		if(eventTrigger->GetEventName().Lower() == wxT("ddl_command_start"))
 			rdbEvents->SetSelection(0);
-		else if(eventTrigger->GetEventName().Lower() == wxT("ddl command end"))
+		else if(eventTrigger->GetEventName().Lower() == wxT("ddl_command_end"))
 			rdbEvents->SetSelection(1);
 		else
 			rdbEvents->SetSelection(2);
@@ -210,12 +212,14 @@ void dlgEventTrigger::CheckChange()
 
 	if (eventTrigger)
 	{
+		wxString tmp= eventTrigger->GetEventName().Lower();
+		tmp.Replace("_", " ");
 		EnableOK(enable &&
 		         (txtComment->GetValue() != eventTrigger->GetComment() ||
 		          txtName->GetValue() != eventTrigger->GetName() ||
 		          txtWhen->GetValue() != eventTrigger->GetWhen() ||
 		          chkEnable->GetValue() != eventTrigger->GetEnabled() ||
-		          rdbEvents->GetStringSelection().Lower() != eventTrigger->GetEventName().Lower() ||
+		          rdbEvents->GetStringSelection().Lower() != tmp ||
 		          rdbEnableStatus->GetStringSelection().Lower() != eventTrigger->GetEnableStatus().Lower() ||
 		          !function.IsEmpty() ||
 		          !owner.IsEmpty()
diff --git a/schema/pgEventTrigger.cpp b/schema/pgEventTrigger.cpp
index c821a00..3dc4980 100644
--- a/schema/pgEventTrigger.cpp
+++ b/schema/pgEventTrigger.cpp
@@ -48,7 +48,7 @@ pgObject *pgEventTriggerFactory::CreateObjects(pgCollection *collection, ctlTree
 	wxString sql;
 	pgEventTrigger *eventTrigger = 0;
 
-	sql = wxT("SELECT e.oid, e.xmin, e.evtname AS name, REPLACE(e.evtevent, '_', ' ') AS eventname, pg_catalog.pg_get_userbyid(e.evtowner) AS eventowner, ")
+	sql = wxT("SELECT e.oid, e.xmin, e.evtname AS name, e.evtevent AS eventname, pg_catalog.pg_get_userbyid(e.evtowner) AS eventowner, ")
 	      wxT(" CASE e.evtenabled WHEN 'O' THEN 'enabled' WHEN 'R' THEN 'replica' WHEN 'A' THEN 'always' WHEN 'D' THEN 'disabled' END AS enabled, ")
 	      wxT(" e.evtfoid AS eventfuncoid, e.evtfoid::regproc AS eventfunname, array_to_string(array(select quote_literal(x) from unnest(evttags) as t(x)), ', ') AS when, ")
 	      wxT(" pg_catalog.obj_description(e.oid, 'pg_event_trigger') AS comment, ")
diff --git a/x64/Release_(3.0)/pgAdmin3.exe b/x64/Release_(3.0)/pgAdmin3.exe
index fbb9d0e..19f3ab0 100644
Binary files a/x64/Release_(3.0)/pgAdmin3.exe and b/x64/Release_(3.0)/pgAdmin3.exe differ