Merge branch 'release-3.4'

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mattermost",
   "productName": "Mattermost",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
   "author": {

src/browser/index.jsx

@@ -113,8 +113,10 @@ var MainPage = React.createClass({
       }
     });
   },
-  componentDidUpdate: function() {
+  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;

src/package.json

@@ -2,7 +2,7 @@
   "name": "mattermost",
   "productName": "Mattermost",
   "desktopName": "Mattermost.desktop",
-  "version": "3.4.0",
+  "version": "3.4.1",
   "description": "Mattermost Desktop application for Windows, Mac and Linux",
   "main": "main.js",
   "author": {