diff --git a/modules/editor/components/emoticon/tpl/popup.html b/modules/editor/components/emoticon/tpl/popup.html
index 3fe5aa7c7..e408bf16b 100644
--- a/modules/editor/components/emoticon/tpl/popup.html
+++ b/modules/editor/components/emoticon/tpl/popup.html
@@ -11,5 +11,5 @@
 			</select>
 		</div>
 	</div>
-	<div id="emoticons" style="height:1px"></div>
+	<div id="emoticons" style="min-height:1px"></div>
 </section>
diff --git a/modules/editor/components/emoticon/tpl/popup.js b/modules/editor/components/emoticon/tpl/popup.js
index 31417ff57..a44f31450 100644
--- a/modules/editor/components/emoticon/tpl/popup.js
+++ b/modules/editor/components/emoticon/tpl/popup.js
@@ -22,7 +22,20 @@ function completeGetEmoticons(ret_obj) {
     for(var i=0;i<emoticons.length;i++) {
 		html[html.length] = '<img src="./modules/editor/components/emoticon/tpl/images/'+emoticons[i]+'" class="emoticon" />';
     }
-	jQuery('#emoticons').html(html.join('')).find('img.emoticon').click(insertEmoticon);
+	jQuery('#emoticons').html(html.join('')).find('img.emoticon')
+		.click(insertEmoticon)
+		.load(function(){
+			/* resize popup window for new emoticons loaded, 2015-07-14 by misol */
+			if(jQuery('section.section').outerHeight(true) != jQuery( window ).height())
+			{
+				// more space for y-scroll
+				var ww = (jQuery('section.section').outerHeight(true) > jQuery( window ).height())? jQuery('section.section').outerWidth(true) + 60 : jQuery('section.section').outerWidth(true) + 30;
+				// not more than screen height
+				var wh = (screen.height-100 < jQuery('section.section').outerHeight(true)+100)? screen.height-100 : jQuery('section.section').outerHeight(true)+100;
+
+				window.resizeTo(ww, wh); 
+			}
+		});
 }
 
 /**
diff --git a/modules/editor/components/emoticon/tpl/popup.min.js b/modules/editor/components/emoticon/tpl/popup.min.js
new file mode 100644
index 000000000..11e57942b
--- /dev/null
+++ b/modules/editor/components/emoticon/tpl/popup.min.js
@@ -0,0 +1 @@
+jQuery(function(e){function o(e){var o={component:"emoticon",emoticon:e,method:"getEmoticonList"},t="error message emoticons".split(" ");exec_xml("editor","procEditorCall",o,i,t)}function i(e){for(var o=e.emoticons.split("\n"),i=[],n=0;n<o.length;n++)i[i.length]='<img src="./modules/editor/components/emoticon/tpl/images/'+o[n]+'" class="emoticon" />';jQuery("#emoticons").html(i.join("")).find("img.emoticon").click(t).load(function(){if(jQuery("section.section").outerHeight(!0)!=jQuery(window).height()){var e=jQuery("section.section").outerHeight(!0)>jQuery(window).height()?jQuery("section.section").outerWidth(!0)+60:jQuery("section.section").outerWidth(!0)+30,o=screen.height-100<jQuery("section.section").outerHeight(!0)+100?screen.height-100:jQuery("section.section").outerHeight(!0)+100;window.resizeTo(e,o)}})}function t(){var e,o=n?opener:window;if(o)return e='<img src="'+this.src+'" class="emoticon" />',o.editorFocus(o.editorPrevSrl),o.editorRelKeys[o.editorPrevSrl].pasteHTML(e),n&&window.focus(),!1}var n=window._isPoped;o("msn"),e("#selectEmoticonList").change(function(){o(this.value)})});
\ No newline at end of file