diff --git a/ChangeLog b/ChangeLog
index 7f99668e6..2b0132d99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2015-09-19  Moritz Bunkus  <moritz@bunkus.org>
+
+        * MKVToolNix GUI: chapter editor bug fix: whenever the additional
+        modification of »expanding start/end timecodes to include the
+        minimum/maximum timecodes of their children« was run on an edition
+        entry then ChapterTimeStart and sometimes ChapterTimeEnd nodes
+        were inserted as direct children of the EditionEntry node when
+        saving. This resulted in invalid chapters.
+
 2015-09-18  Moritz Bunkus  <moritz@bunkus.org>
 
         * MKVToolNix GUI: new merge tool feature: when dragging & dropping
diff --git a/src/mkvtoolnix-gui/chapter_editor/tab.cpp b/src/mkvtoolnix-gui/chapter_editor/tab.cpp
index cfce0fbd3..85a7644c1 100644
--- a/src/mkvtoolnix-gui/chapter_editor/tab.cpp
+++ b/src/mkvtoolnix-gui/chapter_editor/tab.cpp
@@ -1082,7 +1082,7 @@ Tab::expandTimecodes(QStandardItem *item) {
   if (!item)
     return {};
 
-  auto chapter = m_chapterModel->chapterFromItem(item);
+  auto chapter = item->parent() ? m_chapterModel->chapterFromItem(item) : ChapterPtr{};
   if (!chapter) {
     for (auto row = 0, numRows = item->rowCount(); row < numRows; ++row)
       expandTimecodes(item->child(row));