diff --git a/packages/rocketchat-theme/client/imports/general/forms.css b/packages/rocketchat-theme/client/imports/general/forms.css
index 580099754d3..919124f0c8f 100644
--- a/packages/rocketchat-theme/client/imports/general/forms.css
+++ b/packages/rocketchat-theme/client/imports/general/forms.css
@@ -178,21 +178,20 @@
 	&__toolbar-markdown {
 		position: absolute;
 		bottom: 4px;
-		display: flex;
 		width: 100%;
 		justify-content: center;
 		left: 0;
 		color: #9ea2a8;
+		text-align: center;
 
 		&__item {
-			width: 16px;
-			height: 16px;
 			margin: 0 4px;
-			text-align: center;
-			transition: color 0.5s;
+			transition: color 0.1s;
+			display: inline-block;
 
 			&:hover,
-			&:focus {
+			&:focus,
+			&.active {
 				color: #2f343d;
 			}
 		}
diff --git a/packages/rocketchat-ui-message/client/messageBox.html b/packages/rocketchat-ui-message/client/messageBox.html
index 2cc7f0cbe37..18be7f86a07 100644
--- a/packages/rocketchat-ui-message/client/messageBox.html
+++ b/packages/rocketchat-ui-message/client/messageBox.html
@@ -143,10 +143,9 @@
 						</div>
 					{{/if}}
 				{{/if}} -->
-				<button class="rc-message-box__toolbar-markdown__item">b</button>
-				<button class="rc-message-box__toolbar-markdown__item">i</button>
-				<button class="rc-message-box__toolbar-markdown__item">u</button>
-				<button class="rc-message-box__toolbar-markdown__item">s</button>
+				{{#each mdButtons}}
+					<button class="rc-message-box__toolbar-markdown__item rc-tooltip js-md" aria-label={{label}}>{{label}}</button>
+				{{/each}}
 			</div>
 		</div>
 		<form class="message-form" method="post" style="display:none;" action="/">
diff --git a/packages/rocketchat-ui-message/client/messageBox.js b/packages/rocketchat-ui-message/client/messageBox.js
index c8771e19b43..8915e8ff814 100644
--- a/packages/rocketchat-ui-message/client/messageBox.js
+++ b/packages/rocketchat-ui-message/client/messageBox.js
@@ -19,7 +19,69 @@ function katexSyntax() {
 	return false;
 }
 
+
+function applyMd(e, t) {
+	e.preventDefault();
+	const box = t.find('.js-input-message');
+	const {selectionEnd = box.value.length, selectionStart = 0} = box;
+	const initText = box.value.slice(0, selectionStart);
+	const text = box.value.slice(selectionStart, selectionEnd);
+	const finalText = box.value.slice(selectionEnd, box.value.length);
+
+	const [btn] = t.findAll(`.js-md[aria-label=${ this.label }]`);
+	if (btn) {
+		btn.classList.add('active');
+		setTimeout(function() {
+			btn.classList.remove('active');
+		}, 100);
+	}
+	/*
+		get text
+		apply pattern
+		restore selection
+	*/
+	box.value = initText+this.pattern.replace('{{text}}', text)+finalText;
+	box.focus();
+	box.selectionStart = selectionStart + this.pattern.indexOf('{{text}}');
+	box.selectionEnd = box.selectionStart + text.length;
+	$(box).change();
+}
+
+
+const markdownButtons = [
+	{
+		label: 'bold',
+		pattern: '*{{text}}*',
+		group: 'showMarkdown',
+		command: 'b'
+	},
+	{
+		label: 'italic',
+		pattern: '_{{text}}_',
+		group: 'showMarkdown',
+		command:'i'
+	},
+	{
+		label: 'strike',
+		pattern: '~{{text}}~',
+		group: 'showMarkdown'
+	},
+	{
+		label: 'inline_code',
+		pattern: '`{{text}}`',
+		group: 'showMarkdownCode'
+	},
+	{
+		label: 'multi',
+		pattern: '```\n{{text}}\n``` ',
+		group: 'showMarkdownCode'
+	}
+];
+
 Template.messageBox.helpers({
+	mdButtons() {
+		return markdownButtons;
+	},
 	roomName() {
 		const roomData = Session.get(`roomData${ this._id }`);
 		if (!roomData) {
@@ -312,7 +374,13 @@ Template.messageBox.events({
 			return instance.isMessageFieldEmpty.set(false);
 		}
 	},
-	'keydown .js-input-message': firefoxPasteUpload(function(event) {
+	'keydown .js-input-message': firefoxPasteUpload(function(event, t) {
+		if ((navigator.platform.indexOf('Mac') !== -1 && event.metaKey) || (navigator.platform.indexOf('Mac') === -1 && event.ctrlKey)) {
+			const action = markdownButtons.find(action => action.command === event.key);
+			if (action) {
+				applyMd.apply(action, [event, t]);
+			}
+		}
 		return chatMessages[this._id].keydown(this._id, event, Template.instance());
 	}),
 	'input .js-input-message'(event) {
@@ -426,7 +494,11 @@ Template.messageBox.events({
 				});
 			});
 		});
+	},
+	'click .js-md'(e, t) {
+		applyMd.apply(this, [e, t]);
 	}
+
 });
 
 Template.messageBox.onRendered(function() {
diff --git a/packages/rocketchat-ui/client/views/app/createChannel.js b/packages/rocketchat-ui/client/views/app/createChannel.js
index 19d3826e573..06f902c88bc 100644
--- a/packages/rocketchat-ui/client/views/app/createChannel.js
+++ b/packages/rocketchat-ui/client/views/app/createChannel.js
@@ -101,6 +101,7 @@ Template.createChannel.events({
 		t.type.set(e.target.checked ? e.target.value : 'p');
 	},
 	'input [name=users]'(e, t) {
+		console.log(this);
 		const input = e.target;
 		const position = input.selectionEnd || input.selectionStart;
 		const length = input.value.length;