diff --git a/apps/comments/css/comments.css b/apps/comments/css/comments.css
index 7f64f1cf7db59..d4b72d21478a5 100644
--- a/apps/comments/css/comments.css
+++ b/apps/comments/css/comments.css
@@ -25,7 +25,7 @@
 
 #commentsTabView .newCommentForm .submit {
 	position: absolute;
-	top: 1px;
+	bottom: 1px;
 	right: 8px;
 	width: 30px;
 	margin: 0;
@@ -47,6 +47,10 @@
 	margin-right: 6px;
 }
 
+#commentsTabView .newCommentForm textarea {
+	resize: none;
+}
+
 #commentsTabView .comment {
 	position: relative;
 	z-index: 1;
diff --git a/apps/comments/js/commentstabview.js b/apps/comments/js/commentstabview.js
index 82244d61e9acc..fe3695569bfb5 100644
--- a/apps/comments/js/commentstabview.js
+++ b/apps/comments/js/commentstabview.js
@@ -32,7 +32,7 @@
 		'{{/if}}' +
 		'    </div>' +
 		'    <form class="newCommentForm">' +
-		'        <input type="text" class="message" placeholder="{{newMessagePlaceholder}}" value="{{message}}" />' +
+		'        <textarea rows="1" class="message" placeholder="{{newMessagePlaceholder}}">{{message}}</textarea>' +
 		'        <input class="submit icon-confirm" type="submit" value="" />' +
 		'{{#if isEditMode}}' +
 		'        <input class="cancel pull-right" type="button" value="{{cancelText}}" />' +
@@ -174,6 +174,8 @@
 			}
 			this.delegateEvents();
 			this.$el.find('.message').on('keydown input change', this._onTypeComment);
+
+			autosize(this.$el.find('.newCommentRow textarea'))
 		},
 
 		_formatItem: function(commentModel) {
@@ -281,6 +283,9 @@
 			$formRow.find('.avatar').replaceWith($comment.find('.avatar').clone());
 			$formRow.find('.has-tooltip').tooltip();
 
+			// Enable autosize
+			autosize($formRow.find('textarea'));
+
 			return false;
 		},
 
@@ -346,7 +351,6 @@
 				}
 			});
 
-
 			return false;
 		},