diff --git a/modules/editor/tpl/editor.html b/modules/editor/tpl/editor.html
index fcda6a7d4..14985f60d 100644
--- a/modules/editor/tpl/editor.html
+++ b/modules/editor/tpl/editor.html
@@ -38,6 +38,8 @@
       <img src="./images/italic.gif" alt="{$lang->edit->help_italic}" class="editor_icon" id="component_{$upload_target_srl}_Italic" />
       <img src="./images/underline.gif" alt="{$lang->edit->help_underline}" class="editor_icon" id="component_{$upload_target_srl}_Underline" />
       <img src="./images/strike.gif" alt="{$lang->edit->help_strike}" class="editor_icon" id="component_{$upload_target_srl}_StrikeThrough" />
+      <img src="./images/undo.gif" alt="{$lang->edit->help_undo}" class="editor_icon" id="component_{$upload_target_srl}_undo" />
+      <img src="./images/redo.gif" alt="{$lang->edit->help_redo}" class="editor_icon" id="component_{$upload_target_srl}_redo" />
     </div>
 
     <!-- 에디팅 관련 문단 기능 (IE에서는 사용자 선택시 나타남) -->
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 2fd3dd944..6f6910306 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -255,6 +255,8 @@ function editorEventCheck(evt) {
         case 'outdent' :
         case 'insertorderedlist' :
         case 'insertunorderedlist' :
+        case 'undo' :
+        case 'redo' :
                 editorDo(component_name, '', upload_target_srl);
             break;
 
@@ -371,8 +373,14 @@ function editorDo(name, value, target) {
 function _editorDoSrl(name, value, upload_target_srl) {
     var iframe_obj = editorGetIFrame(upload_target_srl);
     editorFocus(upload_target_srl);
-    if(xIE4Up) iframe_obj.contentWindow.document.execCommand(name, false, value);
-    else iframe_obj.contentWindow.document.execCommand(name, false, value);
+    try {
+      if(xIE4Up) {
+        iframe_obj.contentWindow.document.execCommand(name, false, value);
+      } else {
+        iframe_obj.contentWindow.document.execCommand(name, false, value);
+      }
+    } catch(e) {
+    }
     editorFocus(upload_target_srl);
 }
 
diff --git a/modules/editor/tpl/lang/ko.lang.php b/modules/editor/tpl/lang/ko.lang.php
index c853678ab..edb20aa90 100644
--- a/modules/editor/tpl/lang/ko.lang.php
+++ b/modules/editor/tpl/lang/ko.lang.php
@@ -33,13 +33,8 @@
   $lang->edit->help_italic = "글자를 기울이게 합니다";
   $lang->edit->help_underline = "밑줄을 긋습니다";
   $lang->edit->help_strike = "취소선을 긋습니다";
-  $lang->edit->help_add_url= "link를 만듭니다";
-  $lang->edit->help_add_image = "이미지를 추가합니다";
-  $lang->edit->help_add_multimedia = "동영상/플래쉬등을 추가합니다";
-  $lang->edit->help_add_emoticon = "이모티콘을 추가합니다";
-  $lang->edit->help_add_quotation = "글박스를 만들거나 글숨김 기능을 추가합니다";
-  $lang->edit->help_add_html = "html 코드를 직접 입력합니다";
-  $lang->edit->help_add_html = "html 코드를 직접 입력합니다";
+  $lang->edit->help_redo = "이전 동작으로 돌아갑니다";
+  $lang->edit->help_undo = "다음 동작으로 돌아갑니다";
   $lang->edit->help_align_left = "왼쪽 정렬을 합니다";
   $lang->edit->help_align_center = "가운데 정렬을 합니다";
   $lang->edit->help_align_right = "오른쪽 정렬을 합니다";