diff --git a/ChangeLog b/ChangeLog
index 68a688ee0..f1a4010b3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-05-18  Moritz Bunkus  <moritz@bunkus.org>
+
+        * mmg: enhancement: The chapter editor will only use fast-mode
+        parsing when loading chapters from Matroska files.
+
 2014-05-14  Moritz Bunkus  <moritz@bunkus.org>
 
         * all: bug fix: fixed invalid memory access in the cleanup
diff --git a/src/mmg/tabs/chapters.cpp b/src/mmg/tabs/chapters.cpp
index ea1c0c894..ebc72c6a0 100644
--- a/src/mmg/tabs/chapters.cpp
+++ b/src/mmg/tabs/chapters.cpp
@@ -594,7 +594,7 @@ tab_chapters::load(wxString name) {
     if (kax_analyzer_c::probe(wxMB(name))) {
       analyzer  = wx_kax_analyzer_cptr(new wx_kax_analyzer_c(this, wxMB(name)));
       file_name = name;
-      if (!analyzer->process(kax_analyzer_c::parse_mode_full, MODE_READ)) {
+      if (!analyzer->process(kax_analyzer_c::parse_mode_fast, MODE_READ)) {
         wxMessageBox(Z("This file could not be opened or parsed."), Z("File parsing failed"), wxOK | wxCENTER | wxICON_ERROR);
         analyzer.reset();