diff --git a/modules/editor/skins/default/editor.html b/modules/editor/skins/default/editor.html
index 0dda71f6b..4871d06a1 100644
--- a/modules/editor/skins/default/editor.html
+++ b/modules/editor/skins/default/editor.html
@@ -71,7 +71,6 @@
                     <!--<img src="./images/editor_btn_aj.gif" width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />-->
                 </div>
 
-                <!--
                 <div class="buttonGroup">
                     <img src="./images/editor_btn_od.gif" title="{$lang->edit->help_remove_indent}" alt="{$lang->edit->help_remove_indent}"  id="component_{$editor_sequence}_outdent" width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                     <img src="./images/editor_btn_id.gif" width="23" height="63" title="{$lang->edit->help_add_indent}" alt="{$lang->edit->help_add_indent}" id="component_{$editor_sequence}_indent" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
@@ -82,6 +81,7 @@
                     <img src="./images/editor_btn_ul.gif" title="{$lang->edit->help_list_bullet}" alt="{$lang->edit->help_list_bullet}" id="component_{$editor_sequence}_insertunorderedlist"  width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                 </div>
 
+                <!--
                 <div class="buttonGroup">
                     <img src="./images/editor_btn_lh.gif" alt="Line hight" width="23" height="63" onmouseover="eOptionOver(this)" onmouseout="eOptionOut(this)" />
                 </div>
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index a489609f5..787a9d2f3 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -357,9 +357,21 @@ function editorKeyPress(evt) {
     if (xIE4Up && !e.ctrlKey && !e.shiftKey && e.keyCode == 13 && editor_mode[editor_sequence]!='html') {
         var iframe_obj = editorGetIFrame(editor_sequence);
         if(!iframe_obj) return;
+
         var contentDocument = iframe_obj.contentWindow.document;
+
         var obj = contentDocument.selection.createRange();
-        obj.pasteHTML("<br />\n");
+
+        var pTag = obj.parentElement().tagName.toLowerCase();
+
+        switch(pTag) {
+            case 'li' :
+                    return;
+                break; 
+            default :
+                    obj.pasteHTML("<br />\n");
+                break;
+        }
         obj.select();
         evt.cancelBubble = true;
         evt.returnValue = false;