diff --git a/shared/actions/team-building.tsx b/shared/actions/team-building.tsx
index 8b5df9214f08..2144b97f9e82 100644
--- a/shared/actions/team-building.tsx
+++ b/shared/actions/team-building.tsx
@@ -177,7 +177,6 @@ const fetchUserRecs = (state: TypedState, {payload: {namespace, includeContacts}
     .then(([_suggestionRes, _contactRes]) => {
       const suggestionRes = _suggestionRes || []
       const contactRes = _contactRes || []
-      const contactUsernames = new Set(contactRes.map(x => x.username).filter(Boolean))
       const contacts = contactRes.map(
         (x): TeamBuildingTypes.User => ({
           contact: true,
@@ -187,15 +186,13 @@ const fetchUserRecs = (state: TypedState, {payload: {namespace, includeContacts}
           serviceMap: {keybase: x.username},
         })
       )
-      let suggestions = suggestionRes
-        .filter(({username}) => !contactUsernames.has(username))
-        .map(
-          ({username, fullname}): TeamBuildingTypes.User => ({
-            id: username,
-            prettyName: fullname,
-            serviceMap: {keybase: username},
-          })
-        )
+      let suggestions = suggestionRes.map(
+        ({username, fullname}): TeamBuildingTypes.User => ({
+          id: username,
+          prettyName: fullname,
+          serviceMap: {keybase: username},
+        })
+      )
       const expectingContacts = flags.sbsContacts && state.settings.contacts.importEnabled && includeContacts
       if (expectingContacts) {
         suggestions = suggestions.slice(0, 10)
diff --git a/shared/team-building/container.tsx b/shared/team-building/container.tsx
index 22c544343f68..874b8d09f0de 100644
--- a/shared/team-building/container.tsx
+++ b/shared/team-building/container.tsx
@@ -68,7 +68,7 @@ const deriveSearchResults = memoize(
         followingState: followStateHelperWithId(myUsername, followingState, info.serviceMap.keybase),
         inTeam: teamSoFar.some(u => u.id === info.id),
         isPreExistingTeamMember: preExistingTeamMembers.has(info.id),
-        key: [info.id, info.prettyName, info.label].join('&'),
+        key: [info.id, info.prettyName, info.label, String(!!info.contact)].join('&'),
         prettyName: formatAnyPhoneNumbers(info.prettyName),
         services: info.serviceMap,
         userId: info.id,
diff --git a/shared/team-building/index.tsx b/shared/team-building/index.tsx
index a33ae1f9bd40..dfeafdd58242 100644
--- a/shared/team-building/index.tsx
+++ b/shared/team-building/index.tsx
@@ -346,6 +346,7 @@ class TeamBuilding extends React.PureComponent<Props, {}> {
         >
           <Kb.SectionList
             ref={this.sectionListRef}
+            keyboardDismissMode="on-drag"
             selectedIndex={Styles.isMobile ? undefined : this.props.highlightedIndex || 0}
             sections={this.props.recommendations}
             getItemLayout={this._getRecLayout}