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() {