diff --git a/aegisub/src/dialog_shift_times.cpp b/aegisub/src/dialog_shift_times.cpp
index be4ee5e6b..33538a19b 100644
--- a/aegisub/src/dialog_shift_times.cpp
+++ b/aegisub/src/dialog_shift_times.cpp
@@ -103,12 +103,17 @@ DialogShiftTimes::DialogShiftTimes(agi::Context *context)
 
 	shift_time->SetTime(OPT_GET("Tool/Shift Times/Time")->GetInt());
 	*shift_frames << (int)OPT_GET("Tool/Shift Times/Frames")->GetInt();
-	shift_frames->Disable();
 	shift_by_frames->SetValue(!OPT_GET("Tool/Shift Times/ByTime")->GetBool() && shift_by_frames->IsEnabled());
 	time_fields->SetSelection(OPT_GET("Tool/Shift Times/Type")->GetInt());
 	selection_mode->SetSelection(OPT_GET("Tool/Shift Times/Affect")->GetInt());
 	shift_backward->SetValue(OPT_GET("Tool/Shift Times/Direction")->GetBool());
 
+	if (shift_by_frames->GetValue())
+		shift_time->Disable();
+	else
+		shift_frames->Disable();
+
+
 	// Position controls
 	wxSizer *shift_amount_sizer = new wxFlexGridSizer(2, 2, 5, 5);
 	shift_amount_sizer->Add(shift_by_time, wxSizerFlags(0).Align(wxALIGN_CENTER_VERTICAL));