diff --git a/filemanager/inc/class.filemanager_hooks.inc.php b/filemanager/inc/class.filemanager_hooks.inc.php
index d3812c4065..44dcdb4bbd 100644
--- a/filemanager/inc/class.filemanager_hooks.inc.php
+++ b/filemanager/inc/class.filemanager_hooks.inc.php
@@ -238,8 +238,14 @@ class filemanager_hooks
 		$mimes = array();
 		foreach ($editorLink['mime'] as $mime => $value)
 		{
-			$mimes[$mime] = $value['ext'];
+			$mimes[$mime] = lang('%1 file', strtoupper($value['ext'])).' ('.$mime.')';
+
+			if (!empty($value['extra_extensions']))
+			{
+				$mimes[$mime] .= ', '.strtoupper(implode(', ', $value['extra_extensions']));
+			}
 		}
+		asort($mimes);
 		$settings += array (
 			'sections.2' => array(
 				'type'  => 'section',