diff --git a/aegisub/audio_display.cpp b/aegisub/audio_display.cpp
index 1551a5ab3..5399bbac8 100644
--- a/aegisub/audio_display.cpp
+++ b/aegisub/audio_display.cpp
@@ -986,9 +986,15 @@ void AudioDisplay::SetDialogue(SubtitlesGrid *_grid,AssDialogue *diag,int n) {
 		NeedCommit = false;
 
 		// Set times
-		if (dialogue && !dontReadTimes) {
-			curStartMS = dialogue->Start.GetMS();
-			curEndMS = dialogue->End.GetMS();
+		if (dialogue && !dontReadTimes && Options.AsBool(_T("Audio grab times on select"))) {
+			int s = dialogue->Start.GetMS();
+			int e = dialogue->End.GetMS();
+
+			// Never do it for 0:00:00.00->0:00:00.00 lines
+			if (s != 0 || e != 0) {
+				curStartMS = s;
+				curEndMS = e;
+			}
 		}
 	}
 
diff --git a/aegisub/changelog.txt b/aegisub/changelog.txt
index 2bff69e71..cba5d8cac 100644
--- a/aegisub/changelog.txt
+++ b/aegisub/changelog.txt
@@ -111,6 +111,7 @@ Please visit http://aegisub.net to download latest version
 - Hitting enter on style editor will now "OK" it. (AMZ)
 - Added "Video Formats" to "Open Audio"'s file selector, so you can open audio directly from video files (regardless of whether they're loaded or not). This has always worked, but it was never explicit. (AMZ)
 - Instead of falling back to your local charset, Aegisub will now use the "universalchardet" library (the one used by the Mozilla project) to autodetect the character set of non-Unicode files. (AMZ)
+- Added option to disable automatic grabbing of times from selected lines on the audio display. Also, it will never pick the times from 0:00:00.00 -> 0:00:00.00 lines. (AMZ)
 
 
 = 1.10 beta - 2006.08.07 ===========================
diff --git a/aegisub/dialog_options.cpp b/aegisub/dialog_options.cpp
index af43e9783..69c5791ad 100644
--- a/aegisub/dialog_options.cpp
+++ b/aegisub/dialog_options.cpp
@@ -401,7 +401,7 @@ DialogOptions::DialogOptions(wxWindow *parent)
 		wxSizer *audioMainSizer = new wxBoxSizer(wxVERTICAL);
 		wxSizer *audioSizer1 = new wxStaticBoxSizer(wxVERTICAL,audioPage,_("Options"));
 		wxSizer *audioSizer2 = new wxStaticBoxSizer(wxVERTICAL,audioPage,_("Advanced - EXPERT USERS ONLY"));
-		wxFlexGridSizer *audioSizer3 = new wxFlexGridSizer(3,2,5,5);
+		wxFlexGridSizer *audioSizer3 = new wxFlexGridSizer(4,2,5,5);
 		wxFlexGridSizer *audioSizer4 = new wxFlexGridSizer(4,2,5,5);
 		wxFlexGridSizer *audioSizer5 = new wxFlexGridSizer(4,2,5,5);
 		wxControl *control;
@@ -410,8 +410,8 @@ DialogOptions::DialogOptions(wxWindow *parent)
 		control = new wxCheckBox(audioPage,-1,_("Next line on commit"));
 		Bind(control,_T("Audio Next Line on Commit"));
 		audioSizer3->Add(control,1,wxEXPAND,0);
-		control = new wxCheckBox(audioPage,-1,_("Auto-focus on mouse over"));
-		Bind(control,_T("Audio Autofocus"));
+		control = new wxCheckBox(audioPage,-1,_("Grab times from line upon selection"));
+		Bind(control,_T("Audio grab times on select"));
 		audioSizer3->Add(control,1,wxEXPAND,0);
 		control = new wxCheckBox(audioPage,-1,_("Default mouse wheel to zoom"));
 		Bind(control,_T("Audio Wheel Default To Zoom"));
@@ -425,6 +425,9 @@ DialogOptions::DialogOptions(wxWindow *parent)
 		control = new wxCheckBox(audioPage,-1,_("Snap to adjascent lines"));
 		Bind(control,_T("Audio snap to other lines"));
 		audioSizer3->Add(control,1,wxEXPAND,0);
+		control = new wxCheckBox(audioPage,-1,_("Auto-focus on mouse over"));
+		Bind(control,_T("Audio Autofocus"));
+		audioSizer3->Add(control,1,wxEXPAND,0);
 		audioSizer3->AddGrowableCol(0,1);
 
 		// Second sizer
diff --git a/aegisub/options.cpp b/aegisub/options.cpp
index 35b88bcc6..ba20cf0dc 100644
--- a/aegisub/options.cpp
+++ b/aegisub/options.cpp
@@ -167,6 +167,7 @@ void OptionsManager::LoadDefaults() {
 	// Audio Options
 	SetModificationType(MOD_AUTOMATIC);
 	SetBool(_T("Audio Next Line on Commit"),true);
+	SetBool(_T("Audio grab times on select"),true);
 	SetBool(_T("Audio Autofocus"),false);
 	SetBool(_T("Audio Wheel Default To Zoom"),false);
 	SetBool(_T("Audio lock scroll on cursor"),false);