From 9acaa36d8da623f6b13f027f298a1d368b5a9a1c Mon Sep 17 00:00:00 2001
From: Wesley van der Sanden <wesley.vandersanden@coosto.com>
Date: Sun, 1 Oct 2017 22:21:21 +0200
Subject: [PATCH 1/3] Remove focus after cancelling modal

Closes #446
---
 src/browser/components/SettingsPage.jsx | 1 +
 src/browser/components/TeamListItem.jsx | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/src/browser/components/SettingsPage.jsx b/src/browser/components/SettingsPage.jsx
index 4c519a26..eae6cbc4 100644
--- a/src/browser/components/SettingsPage.jsx
+++ b/src/browser/components/SettingsPage.jsx
@@ -191,6 +191,7 @@ const SettingsPage = createReactClass({
     this.setState({
       showAddTeamForm: !this.state.showAddTeamForm
     });
+    document.activeElement.blur();
   },
   setShowTeamFormVisibility(val) {
     this.setState({
diff --git a/src/browser/components/TeamListItem.jsx b/src/browser/components/TeamListItem.jsx
index 2ea72a7a..620cd25b 100644
--- a/src/browser/components/TeamListItem.jsx
+++ b/src/browser/components/TeamListItem.jsx
@@ -9,9 +9,11 @@ class TeamListItem extends React.Component {
   }
 
   handleTeamRemove() {
+    document.activeElement.blur();
     this.props.onTeamRemove();
   }
   handleTeamEditing() {
+    document.activeElement.blur();
     this.props.onTeamEditing();
   }
   render() {

From b5bc340f32ae96cb87187235ab52a52fb5d86d1c Mon Sep 17 00:00:00 2001
From: Wesley van der Sanden <wesley.vandersanden@coosto.com>
Date: Sat, 7 Oct 2017 14:35:20 +0200
Subject: [PATCH 2/3] Move removing focus to TeamList.jsx

Closes #446
---
 src/browser/components/TeamList.jsx     | 2 ++
 src/browser/components/TeamListItem.jsx | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/browser/components/TeamList.jsx b/src/browser/components/TeamList.jsx
index 1bba6240..946a673e 100644
--- a/src/browser/components/TeamList.jsx
+++ b/src/browser/components/TeamList.jsx
@@ -80,10 +80,12 @@ const TeamList = createReactClass({
     var self = this;
     var teamNodes = this.props.teams.map((team, i) => {
       function handleTeamRemove() {
+        document.activeElement.blur();
         self.openServerRemoveModal(i);
       }
 
       function handleTeamEditing() {
+        document.activeElement.blur();
         self.handleTeamEditing(team.name, team.url, i);
       }
 
diff --git a/src/browser/components/TeamListItem.jsx b/src/browser/components/TeamListItem.jsx
index 620cd25b..2ea72a7a 100644
--- a/src/browser/components/TeamListItem.jsx
+++ b/src/browser/components/TeamListItem.jsx
@@ -9,11 +9,9 @@ class TeamListItem extends React.Component {
   }
 
   handleTeamRemove() {
-    document.activeElement.blur();
     this.props.onTeamRemove();
   }
   handleTeamEditing() {
-    document.activeElement.blur();
     this.props.onTeamEditing();
   }
   render() {

From e23b0d21abdc6fb99e4233199fe6cac3db13137f Mon Sep 17 00:00:00 2001
From: Yuya Ochiai <yuya0321@gmail.com>
Date: Sat, 7 Oct 2017 22:09:42 +0900
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20d994c4..d01f40f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,6 +25,8 @@ Release date: TBD
  [#573](https://github.com/mattermost/desktop/issues/573)
  - Fixed file upload dialogs did not allow any file to be selected.
  [#497](https://github.com/mattermost/desktop/issues/497)
+ - Fixed an issue where unnecessary focus remains after closing dialogs on the settings page.
+ [#446](https://github.com/mattermost/desktop/issues/446)
 
 #### Windows
  - Fixed desktop notifications not working when the window has been minimized from inactive state.