diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html
index 2f991727b..f54a7aa04 100644
--- a/modules/editor/components/emoticon/tpl/popup.html
+++ b/modules/editor/components/emoticon/tpl/popup.html
@@ -8,7 +8,7 @@
 </div>
 
 <div class="emoticonList">
-    <select name="list" onchange="getEmoticons(this.options[this.selectedIndex].value); return false;">
+    <select name="list" id="selectEmoticonList">
     <!--@foreach($emoticon_list as $key => $val)-->
         <option <!--@if($val=='msn')-->selected="select"<!--@end--> value="{$val}">{$val}</option>
     <!--@end-->
diff --git a/modules/editor/components/emoticon/tpl/popup.js b/modules/editor/components/emoticon/tpl/popup.js
index cded638f4..fa8d8cc79 100644
--- a/modules/editor/components/emoticon/tpl/popup.js
+++ b/modules/editor/components/emoticon/tpl/popup.js
@@ -52,5 +52,6 @@ function insertEmoticon() {
 
 // load default emoticon set
 getEmoticons('msn');
+$('#selectEmoticonList').change(function(){ getEmoticons(this.value) });
 
 });