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