diff --git a/aegisub/src/subs_edit_box.cpp b/aegisub/src/subs_edit_box.cpp
index 6adb7a142..86656b112 100644
--- a/aegisub/src/subs_edit_box.cpp
+++ b/aegisub/src/subs_edit_box.cpp
@@ -336,6 +336,7 @@ SubsEditBox::~SubsEditBox() {
 }
 
 void SubsEditBox::Update(int type) {
+	SetEvtHandlerEnabled(false);
 	if (type == AssFile::COMMIT_FULL || type == AssFile::COMMIT_UNDO) {
 		/// @todo maybe preserve selection over undo?
 		StyleBox->Clear();
@@ -355,15 +356,16 @@ void SubsEditBox::Update(int type) {
 		ActorBox->Thaw();
 
 		TextEdit->SetSelection(0,0);
+		SetEvtHandlerEnabled(true);
 		return;
 	}
 
 	SetControlsState(!!line);
 	if (!line) {
+		SetEvtHandlerEnabled(true);
 		return;
 	}
 
-	SetEvtHandlerEnabled(false);
 	StartTime->SetTime(line->Start);
 	EndTime->SetTime(line->End);
 	Duration->SetTime(line->End-line->Start);