diff --git a/admin-dev/themes/default/template/controllers/products/features.tpl b/admin-dev/themes/default/template/controllers/products/features.tpl
index fc270497c..b24279195 100644
--- a/admin-dev/themes/default/template/controllers/products/features.tpl
+++ b/admin-dev/themes/default/template/controllers/products/features.tpl
@@ -68,14 +68,17 @@
 				</td>
 				<td>
 					{foreach from=$languages key=k item=language}
+					{if $languages|count > 1}
 					<div class="row translatable-field lang-{$language.id_lang}">
 						<div class="col-lg-9">
+					{/if}
 							<textarea
-								class="custom_{$available_feature.id_feature}_{$language.id_lang}"
+								class="custom_{$available_feature.id_feature}_{$language.id_lang} textarea-autosize"
 								name="custom_{$available_feature.id_feature}_{$language.id_lang}"
 								cols="40"
 								rows="1"
 								onkeyup="if (isArrowKey(event)) return ;$('#feature_{$available_feature.id_feature}_value').val(0);" >{$available_feature.val[$k].value|escape:'htmlall':'UTF-8'|default:""}</textarea>
+					{if $languages|count > 1}
 						</div>
 						<div class="col-lg-3">
 							<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
@@ -93,6 +96,7 @@
 							</ul>
 						</div>
 					</div>
+					{/if}
 					{/foreach}
 				</td>
 
@@ -112,4 +116,5 @@
 {/if}
 <script type="text/javascript">
 	hideOtherLanguage({$default_language});
+	$(".textarea-autosize").autosize();
 </script>
\ No newline at end of file
diff --git a/controllers/admin/AdminProductsController.php b/controllers/admin/AdminProductsController.php
index 6351ce766..4e248c459 100644
--- a/controllers/admin/AdminProductsController.php
+++ b/controllers/admin/AdminProductsController.php
@@ -2212,6 +2212,9 @@ class AdminProductsControllerCore extends AdminController
 
 	public function initContent($token = null)
 	{
+		//Required for Features Textarea autosize
+		$this->addJS(_PS_JS_DIR_.'jquery/plugins/jquery.autosize.min.js');
+
 		if ($this->display == 'edit' || $this->display == 'add')
 		{
 			$this->fields_form = array();