diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ecf682a..68f0cfad 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,16 @@
 # Mattermost Desktop Application Changelog
 
+## Release v3.4.1
+
+Release date: TBD
+
+### Bug Fixes
+
+#### macOS
+ - Fixed an issue where the app window pops up second to foreground when a new message is received
+
+----
+
 ## Release v3.4.0
 
 Release date: September 22, 2016
diff --git a/src/browser/index.jsx b/src/browser/index.jsx
index 11f45396..b12f9437 100644
--- a/src/browser/index.jsx
+++ b/src/browser/index.jsx
@@ -113,8 +113,10 @@ var MainPage = React.createClass({
       }
     });
   },
-  componentDidUpdate: function() {
-    this.refs[`mattermostView${this.state.key}`].focusOnWebView();
+  componentDidUpdate: function(prevProps, prevState) {
+    if (prevState.key !== this.state.key) { // i.e. When tab has been changed
+      this.refs[`mattermostView${this.state.key}`].focusOnWebView();
+    }
   },
   handleSelect: function(key) {
     const newKey = (this.props.teams.length + key) % this.props.teams.length;