diff --git a/MissionEditor/Tags.cpp b/MissionEditor/Tags.cpp
index dd3df2b..45d5d13 100644
--- a/MissionEditor/Tags.cpp
+++ b/MissionEditor/Tags.cpp
@@ -66,10 +66,10 @@ void CTags::DoDataExchange(CDataExchange* pDX)
 BEGIN_MESSAGE_MAP(CTags, CDialog)
 	//{{AFX_MSG_MAP(CTags)
 	ON_CBN_SELCHANGE(IDC_TAG, OnSelchangeTag)
-	ON_EN_KILLFOCUS(IDC_NAME, OnChangeName)
-	ON_CBN_KILLFOCUS(IDC_REPEAT, OnEditchangeRepeat)
+	ON_EN_CHANGE(IDC_NAME, OnChangeName)
+	ON_CBN_EDITCHANGE(IDC_REPEAT, OnEditchangeRepeat)
 	ON_CBN_SELCHANGE(IDC_REPEAT, OnSelchangeRepeat)
-	ON_CBN_KILLFOCUS(IDC_TRIGGER, OnEditchangeTrigger)
+	ON_CBN_EDITCHANGE(IDC_TRIGGER, OnEditchangeTrigger)
 	ON_CBN_SELCHANGE(IDC_TRIGGER, OnSelchangeTrigger)
 	ON_BN_CLICKED(IDC_DELETE, OnDelete)
 	ON_BN_CLICKED(IDC_ADD, OnAdd)