diff --git a/app/channel-settings/client/stylesheets/channel-settings.css b/app/channel-settings/client/stylesheets/channel-settings.css
index dcf8e63bf85..396bf68ed35 100644
--- a/app/channel-settings/client/stylesheets/channel-settings.css
+++ b/app/channel-settings/client/stylesheets/channel-settings.css
@@ -1,4 +1,4 @@
-html.rtl .flex-tab {
+.rtl .flex-tab {
 	direction: rtl;
 
 	& .channel-settings {
diff --git a/app/channel-settings/client/views/channelSettings.html b/app/channel-settings/client/views/channelSettings.html
index c7c50ecff63..7e736cbeee8 100644
--- a/app/channel-settings/client/views/channelSettings.html
+++ b/app/channel-settings/client/views/channelSettings.html
@@ -28,7 +28,7 @@
 					<label class="rc-input__label">
 						<div class="rc-input__title">{{_ label}}{{equal default value '*'}}</div>
 						<div class="rc-input__wrapper">
-							<input type="text" name="topic" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}"/>
+							<textarea name="topic" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}" id="" cols="30" rows="2"></textarea>
 						</div>
 					</label>
 				</div>
@@ -54,7 +54,7 @@
 						<label class="rc-input__label">
 							<div class="rc-input__title">{{_ label}}{{equal default value '*'}}</div>
 							<div class="rc-input__wrapper">
-								<input type="text" name="description" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}"/>
+								<textarea name="description" value="{{value}}" class="rc-input__element js-input" disabled="{{./disabled}}" id="" cols="30" rows="2"></textarea>
 							</div>
 						</label>
 					</div>
diff --git a/app/ui/client/components/header/headerRoom.js b/app/ui/client/components/header/headerRoom.js
index 887dc0f2ed5..ce6f0ef4d68 100644
--- a/app/ui/client/components/header/headerRoom.js
+++ b/app/ui/client/components/header/headerRoom.js
@@ -79,19 +79,15 @@ Template.headerRoom.helpers({
 		const roomData = Session.get(`roomData${ this._id }`);
 		if (!roomData || !roomData.topic) { return ''; }
 
-		let roomTopic = Markdown.parse(roomData.topic);
+		let roomTopic = Markdown.parse(roomData.topic.replace(/\n/mg, ' '));
 
 		// &#39; to apostrophe (') for emojis such as :')
 		roomTopic = roomTopic.replace(/&#39;/g, '\'');
 
-		Object.keys(emoji.packages).forEach((emojiPackage) => {
-			roomTopic = emoji.packages[emojiPackage].render(roomTopic);
-		});
+		roomTopic = Object.keys(emoji.packages).reduce((topic, emojiPackage) => emoji.packages[emojiPackage].render(topic), roomTopic);
 
 		// apostrophe (') back to &#39;
-		roomTopic = roomTopic.replace(/\'/g, '&#39;');
-
-		return roomTopic;
+		return roomTopic.replace(/\'/g, '&#39;');
 	},
 
 	roomIcon() {