2 files changed, 32 insertions, 0 deletions

diff --git a/webapp/components/emoji/components/emoji_list.jsx b/webapp/components/emoji/components/emoji_list.jsx
index 76c509f12..a539a5537 100644
--- a/webapp/components/emoji/components/emoji_list.jsx
+++ b/webapp/components/emoji/components/emoji_list.jsx
@@ -27,6 +27,8 @@ export default class EmojiList extends React.Component {
     constructor(props) {
         super(props);
 
+        this.updateTitle = this.updateTitle.bind(this);
+
         this.handleEmojiChange = this.handleEmojiChange.bind(this);
         this.handleUserChange = this.handleUserChange.bind(this);
         this.deleteEmoji = this.deleteEmoji.bind(this);
@@ -47,6 +49,17 @@ export default class EmojiList extends React.Component {
         if (window.mm_config.EnableCustomEmoji === 'true') {
             loadEmoji();
         }
+
+        this.updateTitle();
+    }
+
+    updateTitle() {
+        let currentSiteName = '';
+        if (global.window.mm_config.SiteName != null) {
+            currentSiteName = global.window.mm_config.SiteName;
+        }
+
+        document.title = Utils.localizeMessage('custom_emoji.header', 'Custom Emoji') + ' - ' + this.props.team.display_name + ' ' + currentSiteName;
     }
 
     componentWillUnmount() {
diff --git a/webapp/components/integrations/components/integrations.jsx b/webapp/components/integrations/components/integrations.jsx
index e0cc4da22..ad780b605 100644
--- a/webapp/components/integrations/components/integrations.jsx
+++ b/webapp/components/integrations/components/integrations.jsx
@@ -21,6 +21,25 @@ export default class Integrations extends React.Component {
         };
     }
 
+    constructor(props) {
+        super(props);
+
+        this.updateTitle = this.updateTitle.bind(this);
+    }
+
+    componentDidMount() {
+        this.updateTitle();
+    }
+
+    updateTitle() {
+        let currentSiteName = '';
+        if (global.window.mm_config.SiteName != null) {
+            currentSiteName = global.window.mm_config.SiteName;
+        }
+
+        document.title = Utils.localizeMessage('admin.sidebar.integrations', 'Integrations') + ' - ' + this.props.team.display_name + ' ' + currentSiteName;
+    }
+
     render() {
         const options = [];
         const config = window.mm_config;