diff --git a/ChangeLog b/ChangeLog
index 234adae50..fb871bfd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-11-19  Moritz Bunkus  <moritz@bunkus.org>
+
+	* mmg: bug fix: Fixed a problem with the selection of language
+	codes for chapters in the chapter editor.
+
 2005-11-18  Moritz Bunkus  <moritz@bunkus.org>
 
 	* mkvmerge: bug fix: If at least or more attachments were present
diff --git a/src/mmg/tab_chapters.cpp b/src/mmg/tab_chapters.cpp
index 6ea8ecd37..02df65f8c 100644
--- a/src/mmg/tab_chapters.cpp
+++ b/src/mmg/tab_chapters.cpp
@@ -1983,7 +1983,7 @@ tab_chapters::set_display_values(KaxChapterDisplay *display) {
   count = cob_language_code->GetCount();
   found = false;
   for (i = 0; i < count; i++)
-    if (cob_language_code->GetString(i) == language) {
+    if (extract_language_code(cob_language_code->GetString(i)) == language) {
       found = true;
       break;
     }