diff --git a/ChangeLog b/ChangeLog
index ad154efda..7638f5eee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-21  Moritz Bunkus  <moritz@bunkus.org>
+
+        * mmg: bug fix: Selecting a subtitle track correctly sets the
+        »character set« drop-down box if no character set was set for this
+        track. Fixes #1008.
+
 2014-04-20  Moritz Bunkus  <moritz@bunkus.org>
 
         * mmg: enhancement: mmg will look for the »mkvmerge« executable in
diff --git a/src/mmg/tabs/input.cpp b/src/mmg/tabs/input.cpp
index 12fb075fa..6beb34f9e 100644
--- a/src/mmg/tabs/input.cpp
+++ b/src/mmg/tabs/input.cpp
@@ -1000,7 +1000,7 @@ tab_input::on_track_selected(wxCommandEvent &) {
   ti_format->cb_fix_bitstream_timing_info->SetValue(t->fix_bitstream_timing_info);
   ti_format->cob_nalu_size_length->SetSelection(t->nalu_size_length / 2);
   ti_format->cob_stereo_mode->SetSelection(t->stereo_mode);
-  ti_format->cob_sub_charset->SetValue(ti_format->cob_sub_charset_translations.to_translated(t->sub_charset));
+  ti_format->cob_sub_charset->SetValue(ti_format->cob_sub_charset_translations.to_translated(t->sub_charset.IsEmpty() ? wxT("default") : t->sub_charset));
   ti_format->tc_cropping->SetValue(t->cropping);
   ti_format->tc_delay->SetValue(t->delay);
   ti_format->tc_display_height->SetValue(t->dheight);