diff --git a/packages/assistify/config.js b/packages/assistify/config.js
index c8917a41fd25..1f5c16083122 100644
--- a/packages/assistify/config.js
+++ b/packages/assistify/config.js
@@ -3,7 +3,7 @@ Meteor.startup(() => {
 	// Consequently hide the original group
 	RocketChat.settings.removeById('dbsAI');
 
-	RocketChat.settings.addGroup('Assistify', function () {
+	RocketChat.settings.addGroup('Assistify', function() {
 
 		this.add('Assistify_Show_Standard_Features', false, {
 			i18nLabel: 'Assistify_Show_Standard_Features',
@@ -11,7 +11,7 @@ Meteor.startup(() => {
 			public: true
 		});
 
-		this.section('Knowledge_Base', function () {
+		this.section('Knowledge_Base', function() {
 
 			this.add('DBS_AI_Enabled', false, {
 				type: 'boolean',
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index 19a666e66708..838f8983bec0 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -272,7 +272,12 @@ Template.messageBox.events({
 	},
 	'focus .input-message'(event, instance) {
 		KonchatNotification.removeRoomNotification(this._id);
-		chatMessages[this._id].input = instance.find('.input-message');
+		const input = event.target;
+		chatMessages[this._id].input = input;
+		if (event.target.value) {
+			instance.isMessageFieldEmpty.set(false);
+			return typeof input.updateAutogrow === 'function' && input.updateAutogrow();
+		}
 	},
 	'click .send-button'(event, instance) {
 		const input = instance.find('.input-message');