diff --git a/classes/extravar/Extravar.class.php b/classes/extravar/Extravar.class.php
index 7baf10c8f..4299146d2 100644
--- a/classes/extravar/Extravar.class.php
+++ b/classes/extravar/Extravar.class.php
@@ -597,7 +597,7 @@ class ExtraItem
 		}
 		if($this->desc)
 		{
-			$buff[] = '<p>' . escape(Context::replaceUserLang($this->desc), false) . '</p>';
+			$buff[] = '<p>' . nl2br(trim(escape(Context::replaceUserLang($this->desc), false))) . '</p>';
 		}
 
 		return join("\n", $buff);
diff --git a/modules/document/tpl/extra_keys.html b/modules/document/tpl/extra_keys.html
index 9d007ac2d..f3acbde76 100644
--- a/modules/document/tpl/extra_keys.html
+++ b/modules/document/tpl/extra_keys.html
@@ -59,7 +59,7 @@
 			<div class="x_control-group">
 				<label class="x_control-label" for="lang_desc">{$lang->description}</label>
 				<div class="x_controls">
-					<input type="text" name="desc" id="desc" value="<!--@if(strpos($selected_var->desc, '$user_lang->') === false)-->{$selected_var->desc}<!--@else-->{escape($selected_var->desc, false)}<!--@end-->" class="lang_code" />
+					<textarea type="text" name="desc" id="desc" class="lang_code"><!--@if(strpos($selected_var->desc, '$user_lang->') === false)-->{$selected_var->desc}<!--@else-->{escape($selected_var->desc, false)}<!--@end--></textarea>
 					<p class="x_help-block">{$lang->about_extra_vars_description}</p>
 				</div>
 			</div>