diff --git a/MissionEditor/TeamTypes.cpp b/MissionEditor/TeamTypes.cpp
index 5d22498..cb7f823 100644
--- a/MissionEditor/TeamTypes.cpp
+++ b/MissionEditor/TeamTypes.cpp
@@ -132,15 +132,8 @@ BEGIN_MESSAGE_MAP(CTeamTypes, CDialog)
 	ON_CBN_SELCHANGE(IDC_TEAMTYPES, OnSelchangeTeamtypes)
 	ON_EN_KILLFOCUS(IDC_NAME, OnChangeName)
 	ON_BN_CLICKED(IDC_DELETETEAMTYPE, OnDeleteteamtype)
-	ON_CBN_KILLFOCUS(IDC_VETERANLEVEL, OnEditchangeVeteranlevel)
-	ON_CBN_KILLFOCUS(IDC_HOUSE, OnEditchangeHouse)
 	ON_EN_KILLFOCUS(IDC_PRIORITY, OnChangePriority)
 	ON_EN_KILLFOCUS(IDC_MAX, OnChangeMax)
-	ON_CBN_KILLFOCUS(IDC_TECHLEVEL, OnEditchangeTechlevel)
-	ON_CBN_KILLFOCUS(IDC_GROUP, OnEditchangeGroup)
-	ON_CBN_KILLFOCUS(IDC_WAYPOINT, OnEditchangeWaypoint)
-	ON_CBN_KILLFOCUS(IDC_SCRIPT, OnEditchangeScript)
-	ON_CBN_KILLFOCUS(IDC_TASKFORCE, OnEditchangeTaskforce)
 	ON_CBN_KILLFOCUS(IDC_VETERANLEVEL, OnKillfocusVeteranlevel)
 	ON_CBN_KILLFOCUS(IDC_HOUSE, OnKillfocusHouse)
 	ON_CBN_KILLFOCUS(IDC_TECHLEVEL, OnKillfocusTechlevel)
@@ -170,11 +163,11 @@ BEGIN_MESSAGE_MAP(CTeamTypes, CDialog)
 	ON_BN_CLICKED(IDC_ISBASEDEFENSE, OnIsbasedefense)
 	ON_BN_CLICKED(IDC_ONLYTARGETHOUSEENEMY, OnOnlytargethouseenemy)
 	ON_BN_CLICKED(IDC_NEWTEAMTYPE, OnNewteamtype)
-	ON_CBN_KILLFOCUS(IDC_TAG, OnEditchangeTag)
+	ON_CBN_EDITCHANGE(IDC_TAG, OnEditchangeTag)
 	ON_CBN_KILLFOCUS(IDC_TAG, OnKillfocusTag)
-	ON_CBN_KILLFOCUS(IDC_TRANSPORTWAYPOINT, OnEditchangeTransportwaypoint)
+	ON_CBN_EDITCHANGE(IDC_TRANSPORTWAYPOINT, OnEditchangeTransportwaypoint)
 	ON_CBN_KILLFOCUS(IDC_TRANSPORTWAYPOINT, OnKillfocusTransportwaypoint)
-	ON_CBN_KILLFOCUS(IDC_MINDCONTROLDECISION, OnEditchangeMindcontroldecision)
+	ON_CBN_EDITCHANGE(IDC_MINDCONTROLDECISION, OnEditchangeMindcontroldecision)
 	ON_CBN_KILLFOCUS(IDC_MINDCONTROLDECISION, OnKillfocusMindcontroldecision)
 	//}}AFX_MSG_MAP
 END_MESSAGE_MAP()