diff --git a/packages/rocketchat-theme/assets/stylesheets/base.less b/packages/rocketchat-theme/assets/stylesheets/base.less
index 8836809f64e..f9c9620edc3 100644
--- a/packages/rocketchat-theme/assets/stylesheets/base.less
+++ b/packages/rocketchat-theme/assets/stylesheets/base.less
@@ -2175,6 +2175,7 @@ label.required:after {
 			padding-left: 49px;
 			border-radius: 0;
 			overflow-y: scroll;
+			-webkit-overflow-scrolling: touch;
 			resize: none;
 			line-height: 16px;
 			border-top-width: 0;
diff --git a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
index 3a3b2a0c7c1..a62b601c900 100755
--- a/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
+++ b/packages/rocketchat-theme/assets/stylesheets/utils/_colors.import.less
@@ -715,6 +715,7 @@ a.github-fork {
 			}
 		}
 		textarea {
+			.custom-scroll(transparent, #EAEAEA);
 			&.editing {
 				background-color: #fff7d8;
 			}