diff --git a/web/react/components/setting_item_max.jsx b/web/react/components/setting_item_max.jsx
index 1599041b0d..b978cdb0cd 100644
--- a/web/react/components/setting_item_max.jsx
+++ b/web/react/components/setting_item_max.jsx
@@ -5,6 +5,7 @@ module.exports = React.createClass({
     render: function() {
         var clientError = this.props.client_error ? <div className='form-group'><label className='col-sm-12 has-error'>{ this.props.client_error }</label></div> : null;
         var server_error = this.props.server_error ? <div className='form-group'><label className='col-sm-12 has-error'>{ this.props.server_error }</label></div> : null;
+        var extraInfo = this.props.extraInfo ? this.props.extraInfo : null;
 
         var inputs = this.props.inputs;
 
@@ -15,6 +16,7 @@ module.exports = React.createClass({
                     <ul className="setting-list">
                         <li className="setting-list-item">
                             {inputs}
+                            {extraInfo}
                         </li>
                         <li className="setting-list-item">
                             <hr />
diff --git a/web/react/components/user_settings_notifications.jsx b/web/react/components/user_settings_notifications.jsx
index b89f72987e..ba0bda78e9 100644
--- a/web/react/components/user_settings_notifications.jsx
+++ b/web/react/components/user_settings_notifications.jsx
@@ -1,6 +1,7 @@
 // Copyright (c) 2015 Spinpunch, Inc. All Rights Reserved.
 // See License.txt for license information.
 
+var ChannelStore = require('../stores/channel_store.jsx');
 var UserStore = require('../stores/user_store.jsx');
 var SettingItemMin = require('./setting_item_min.jsx');
 var SettingItemMax = require('./setting_item_max.jsx');
@@ -67,7 +68,11 @@ function getNotificationsStateFromStores() {
         }
     }
 
-    return {notifyLevel: desktop, enableEmail: email, soundNeeded: soundNeeded, enableSound: sound, usernameKey: usernameKey, mentionKey: mentionKey, customKeys: customKeys, customKeysChecked: customKeys.length > 0, firstNameKey: firstNameKey, allKey: allKey, channelKey: channelKey};
+    var curChannel = ChannelStore.getCurrent().display_name;
+
+    return {notifyLevel: desktop, enableEmail: email, soundNeeded: soundNeeded, enableSound: sound,
+            usernameKey: usernameKey, mentionKey: mentionKey, customKeys: customKeys, customKeysChecked: customKeys.length > 0,
+            firstNameKey: firstNameKey, allKey: allKey, channelKey: channelKey, curChannel: curChannel};
 }
 
 export default class NotificationsTab extends React.Component {
@@ -141,10 +146,12 @@ export default class NotificationsTab extends React.Component {
     }
     componentDidMount() {
         UserStore.addChangeListener(this.onListenerChange);
+        ChannelStore.addChangeListener(this.onListenerChange);
         $('#user_settings').on('hidden.bs.modal', this.handleClose);
     }
     componentWillUnmount() {
         UserStore.removeChangeListener(this.onListenerChange);
+        ChannelStore.removeChangeListener(this.onListenerChange);
         $('#user_settings').off('hidden.bs.modal', this.handleClose);
         this.props.updateSection('');
     }
@@ -265,6 +272,12 @@ export default class NotificationsTab extends React.Component {
                 e.preventDefault();
             };
 
+            let extraInfo = (
+                <div className='setting-list__hint'>
+                    These settings will override the global notification settings for the <b>{this.state.curChannel}</b> channel
+                </div>
+            )
+
             desktopSection = (
                 <SettingItemMax
                     title='Send desktop notifications'
@@ -272,6 +285,7 @@ export default class NotificationsTab extends React.Component {
                     submit={this.handleSubmit}
                     server_error={serverError}
                     updateSection={handleUpdateDesktopSection}
+                    extraInfo={extraInfo}
                 />
             );
         } else {
diff --git a/web/react/stores/channel_store.jsx b/web/react/stores/channel_store.jsx
index f7c23841cc..678d50bbd2 100644
--- a/web/react/stores/channel_store.jsx
+++ b/web/react/stores/channel_store.jsx
@@ -270,4 +270,5 @@ ChannelStore.dispatchToken = AppDispatcher.register(function(payload) {
     }
 });
 
+ChannelStore.setMaxListeners(11);
 module.exports = ChannelStore;
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index 99a7eb7bc2..8d743dfe23 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -94,6 +94,11 @@
                 list-style-type:none;
             }
 
+            .setting-list__hint {
+                color: #555;
+                margin-top: 20px;
+            }
+
             .mentions-input {
                 margin-top: 10px;
             }