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.
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/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);
       }