diff --git a/modules/editor/skins/ckeditor/editor.html b/modules/editor/skins/ckeditor/editor.html
index 821e0e4b1..ba4a1a2fa 100644
--- a/modules/editor/skins/ckeditor/editor.html
+++ b/modules/editor/skins/ckeditor/editor.html
@@ -36,7 +36,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
 <input type="hidden" name="_saved_doc_message" value="{$lang->msg_load_saved_doc}" />
 <!--@end-->
 
-<div id="ckeditor_instance_{$editor_sequence}" data-editor-sequence="{$editor_sequence}" data-editor-primary-key-name="{$editor_primary_key_name}" data-editor-content-key-name="{$editor_content_key_name}" style="min-height:{$m ? 160 : $editor_height}px;"></div>
+<div id="ckeditor_instance_{$editor_sequence}" data-editor-sequence="{$editor_sequence}" data-editor-primary-key-name="{$editor_primary_key_name}" data-editor-content-key-name="{$editor_content_key_name}" style="min-height:{$editor_height}px;"></div>
 
 <p cond="$enable_autosave" class="editor_autosaved_message autosave_message" id="editor_autosaved_message_{$editor_sequence}">&nbsp;</p>
 
@@ -91,7 +91,7 @@ var auto_saved_msg = "{$lang->msg_auto_saved}";
 		
 		var settings = {
 			ckeconfig: {
-				height: '{$m ? 160 : $editor_height}',
+				height: '{$editor_height}',
 				skin: '{$colorset}',
 				contentsCss: {json_encode($css_file_list)},
 				xe_editor_sequence: {$editor_sequence},
diff --git a/modules/editor/skins/textarea/editor.html b/modules/editor/skins/textarea/editor.html
index 35b71147d..15732d317 100644
--- a/modules/editor/skins/textarea/editor.html
+++ b/modules/editor/skins/textarea/editor.html
@@ -11,6 +11,7 @@
 			textarea.css("font-family", {json_encode($content_font ?: null)});
 			textarea.css("font-size", {json_encode($content_font_size)});
 			textarea.css("line-height", {json_encode($content_line_height)});
+			textarea.height({intval($editor_height)});
 			if ({json_encode($content_word_break)} === 'none') {
 				textarea.css("white-space", "nowrap");
 			} else {