diff --git a/resources/lib/play_utils.py b/resources/lib/play_utils.py
index 69587bd..a4fa08c 100644
--- a/resources/lib/play_utils.py
+++ b/resources/lib/play_utils.py
@@ -817,12 +817,18 @@ def audio_subs_pref(url, list_item, media_source, item_id, audio_stream_index, s
             audio_streams.append(track)
 
         elif 'Subtitle' in stream['Type']:
-            try:
-                # Track includes language
-                track = "%s - %s" % (index, stream['Language'])
-            except KeyError:
-                # Track doesn't include language
-                track = "%s - %s" % (index, stream['Codec'])
+            language = stream.get('Language', 'Unknown')
+            codec = stream.get('Codec', 'Unknown')
+
+            codec_names = {
+                'subrip': 'SRT',
+                'hdmv_pgs_subtitle': 'PGS',
+                'dvd_subtitle': 'VobSub',
+                'ass': 'ASS'
+            }
+            codec_display = codec_names.get(codec.lower(), codec.upper())
+
+            track = "%s - %s (%s)" % (index, language, codec_display)
 
             default = stream['IsDefault']
             forced = stream['IsForced']