diff --git a/public/res/extensions/welcomeTour.js b/public/res/extensions/welcomeTour.js
index cde952c0..7425ee5e 100644
--- a/public/res/extensions/welcomeTour.js
+++ b/public/res/extensions/welcomeTour.js
@@ -21,6 +21,19 @@ define([
             },
             onEnd: function() {
                 storage.welcomeTour = 'done';
+                var tooltip = $('.button-markdown-syntax').parent().tooltip({
+                    html: true,
+                    container: $('.extension-preview-buttons'),
+                    placement: 'bottom',
+                    trigger: 'manual',
+                    title: 'Need help with Markdown syntax?'
+                }).tooltip('show').addClass('info-tooltip');
+                tooltip.one('click', function() {
+                    tooltip.tooltip('hide').removeClass('info-tooltip');
+                });
+                setTimeout(function() {
+                    tooltip.tooltip('hide').removeClass('info-tooltip');
+                }, 10000);
             },
             template: [
                 '<div class="popover tour">',
@@ -32,7 +45,7 @@ define([
                 '       <button class="btn btn-default" data-role="end">Got it!</button>',
                 '   </nav>',
                 '</div>'
-            ].join("")
+            ].join(""),
         });
         tour.addSteps([
             {
diff --git a/public/res/html/buttonMarkdownSyntax.html b/public/res/html/buttonMarkdownSyntax.html
index ca0f8329..15973653 100644
--- a/public/res/html/buttonMarkdownSyntax.html
+++ b/public/res/html/buttonMarkdownSyntax.html
@@ -1,4 +1,4 @@
-<button class="btn btn-info dropdown-toggle" title="Markdown syntax" data-toggle="dropdown">
+<button class="btn btn-info dropdown-toggle button-markdown-syntax" title="Markdown syntax" data-toggle="dropdown">
 	<i class="icon-help-circled"></i>
 </button>
 <div class="dropdown-menu pull-right">
diff --git a/public/res/styles/main.less b/public/res/styles/main.less
index a0d23f40..f807af7e 100644
--- a/public/res/styles/main.less
+++ b/public/res/styles/main.less
@@ -298,6 +298,7 @@ a {
     &:hover,
     &:focus,
     &:active,
+    .info-tooltip &,
     .open &.dropdown-toggle {
     	color: darken(@secondary, 30%);
     	border-color: fade(@secondary, 10%);