Index: branches/5.0.x/core/admin_templates/popups/editor.tpl
===================================================================
diff -u -r12117 -r12320
--- branches/5.0.x/core/admin_templates/popups/editor.tpl	(.../editor.tpl)	(revision 12117)
+++ branches/5.0.x/core/admin_templates/popups/editor.tpl	(.../editor.tpl)	(revision 12320)
@@ -74,7 +74,11 @@
 
 		</script>
 		<form name="frm" id="frm" action="javascript:update_opener();">
-			<inp2:adm_FCKEditor name="Content" width="100%" height="100" late_load="1"/>
+			<inp2:m_if check="adm_UsePopups">
+				<inp2:adm_FCKEditor name="Content" width="100%" height="100" late_load="1"/>
+			<inp2:m_else/>
+				<inp2:adm_FCKEditor name="Content" width="100%" height="100" height="500"/>
+			</inp2:m_if>
 		</form>
 		<script type="text/javascript">
 			Form.addControl('Content___Frame');