diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index cb3148b7bd..1545cdfaac 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -393,6 +393,7 @@ export default class CreatePost extends React.Component {
             <TutorialTip
                 placement='top'
                 screens={screens}
+                overlayClass='tip-overlay--chat'
             />
         );
     }
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index 39d9808e95..c47919885c 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -358,6 +358,7 @@ export default class Sidebar extends React.Component {
             <TutorialTip
                 placement='right'
                 screens={screens}
+                overlayClass='tip-overlay--sidebar'
             />
         );
     }
diff --git a/web/react/components/sidebar_header.jsx b/web/react/components/sidebar_header.jsx
index 96348f6883..0d48c6f880 100644
--- a/web/react/components/sidebar_header.jsx
+++ b/web/react/components/sidebar_header.jsx
@@ -44,8 +44,6 @@ export default class SidebarHeader extends React.Component {
             this.refs.dropdown.blockToggle = false;
             return;
         }
-        console.log(this.refs.tip);
-        this.refs.tip.toggle();
         $('.team__header').find('.dropdown-toggle').dropdown('toggle');
     }
     createTutorialTip() {
@@ -97,6 +95,7 @@ export default class SidebarHeader extends React.Component {
                     ref='tip'
                     placement='right'
                     screens={screens}
+                    overlayClass='tip-overlay--sidebar'
                 />
             </div>
         );
diff --git a/web/react/components/tutorial/tutorial_tip.jsx b/web/react/components/tutorial/tutorial_tip.jsx
index 3482a7cfaa..118209599a 100644
--- a/web/react/components/tutorial/tutorial_tip.jsx
+++ b/web/react/components/tutorial/tutorial_tip.jsx
@@ -79,6 +79,12 @@ export default class TutorialTip extends React.Component {
                     ref='target'
                 />
 
+                <Overlay
+                    show={this.state.show}
+                >
+                    <div className='tip-backdrop'/>
+                </Overlay>
+
                 <Overlay
                     placement={this.props.placement}
                     show={this.state.show}
@@ -86,7 +92,7 @@ export default class TutorialTip extends React.Component {
                     onHide={this.toggle}
                     target={() => this.refs.target}
                 >
-                    <div className='tip-overlay'>
+                    <div className={'tip-overlay ' + this.props.overlayClass}>
                         {this.props.screens[this.state.currentScreen]}
                         <div className='tutorial__circles'>{dots}</div>
                         <div className='text-right'>
@@ -113,7 +119,12 @@ export default class TutorialTip extends React.Component {
     }
 }
 
+TutorialTip.defaultProps = {
+    overlayClass: ''
+};
+
 TutorialTip.propTypes = {
     screens: React.PropTypes.array.isRequired,
-    placement: React.PropTypes.string.isRequired
+    placement: React.PropTypes.string.isRequired,
+    overlayClass: React.PropTypes.string
 };