diff --git a/ChangeLog b/ChangeLog
index e599d2ead..504b9da5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-02  Moritz Bunkus  <moritz@bunkus.org>
+
+        * mmg: bug fix: Fixed a crash in the chapter editor if the root
+        was selected and the user used the "Set values" button.
+
 2013-01-01  Moritz Bunkus  <moritz@bunkus.org>
 
         * mkvmerge, mmg: removal: The 'header removal compression' method
diff --git a/src/mmg/tabs/chapters.cpp b/src/mmg/tabs/chapters.cpp
index ea02a60de..602936cde 100644
--- a/src/mmg/tabs/chapters.cpp
+++ b/src/mmg/tabs/chapters.cpp
@@ -1021,7 +1021,7 @@ tab_chapters::get_selected_chapter_display() {
     return nullptr;
 
   auto data = static_cast<chapter_node_data_c *>(tc_chapters->GetItemData(id));
-  if (!data->is_atom)
+  if (!data || !data->is_atom)
     return nullptr;
 
   size_t nth_chapter_display = 0;