diff --git a/src/fonteditor/dialog/setting-find-glyf.js b/src/fonteditor/dialog/setting-find-glyf.js
index 8fb09e9..efdb63b 100644
--- a/src/fonteditor/dialog/setting-find-glyf.js
+++ b/src/fonteditor/dialog/setting-find-glyf.js
@@ -13,6 +13,7 @@ define(
             +   '<select id="setting-find-condition" class="form-control">'
             +       '<option value="unicode" selected>' + i18n.lang.dialog_find_glyf_by_unicode + '</option>'
             +       '<option value="name">' + i18n.lang.dialog_find_glyf_by_name + '</option>'
+            +       '<option value="index">' + i18n.lang.dialog_find_glyf_by_index + '</option>'
             +   '</select> '
             +   '<input value="" id="setting-find-value" class="form-control">'
             +   '<p class="form-line">' + i18n.lang.dialog_find_glyf_example + '</p>'
@@ -46,6 +47,15 @@ define(
                         });
                     }
                 }
+                else if (condition === 'index') {
+                    if (value.match(/^\d+(,\d+)?$/)) {
+                        value = value.split(',');
+                    }
+                    else {
+                        $('#setting-find-value').val('');
+                        return false;
+                    }
+                }
 
                 var setting = {};
                 setting[condition] = value;
diff --git a/src/fonteditor/i18n/en-us/dialog.js b/src/fonteditor/i18n/en-us/dialog.js
index 4459e02..5e41b9d 100644
--- a/src/fonteditor/i18n/en-us/dialog.js
+++ b/src/fonteditor/i18n/en-us/dialog.js
@@ -20,7 +20,8 @@ define(
 
             dialog_find_glyf_by_unicode: 'Find Glyph by Unicode',
             dialog_find_glyf_by_name: 'Find Glyph by Name',
-            dialog_find_glyf_example: 'example：Unicode："$21"，Glyph Name： "uniE001"',
+            dialog_find_glyf_by_index: 'Find Glyph by Index',
+            dialog_find_glyf_example: 'example: Unicode："$21", Glyph Name： "uniE001", Index："5"',
 
 
             dialog_editor_setting: 'Editor Setting',
@@ -41,7 +42,7 @@ define(
             dialog_editor_gap: 'Gap Size',
             dialog_editor_metricscolor: 'Metrics Color',
 
-            dialog_glyf_unicode_example: ' &nbsp;&nbsp; Support Multi Unicodes，Example："$21,$22,$23"',
+            dialog_glyf_unicode_example: ' &nbsp;&nbsp; Support Multi Unicodes, Example："$21,$22,$23"',
 
             dialog_unicode_set: 'Set Unicode',
             dialog_unicode_start: 'Start Unicode Code',
diff --git a/src/fonteditor/i18n/zh-cn/dialog.js b/src/fonteditor/i18n/zh-cn/dialog.js
index b53e28e..bd02a7c 100644
--- a/src/fonteditor/i18n/zh-cn/dialog.js
+++ b/src/fonteditor/i18n/zh-cn/dialog.js
@@ -21,7 +21,8 @@ define(
 
             dialog_find_glyf_by_unicode: '按代码点查找字形',
             dialog_find_glyf_by_name: '按名字查找字形',
-            dialog_find_glyf_example: '例如：代码点："$21"，名字： "uniE001"',
+            dialog_find_glyf_by_index: '按字形序号查找字形',
+            dialog_find_glyf_example: '例如：代码点："$21"，名字： "uniE001"，序号："5"',
 
             dialog_editor_setting: '编辑器设置',
             dialog_editor_viewercolor: '字体列表颜色',