diff --git a/internal_packages/thread-search/lib/search-bar.cjsx b/internal_packages/thread-search/lib/search-bar.cjsx
index f9d68c82e..2a7615a38 100644
--- a/internal_packages/thread-search/lib/search-bar.cjsx
+++ b/internal_packages/thread-search/lib/search-bar.cjsx
@@ -90,7 +90,7 @@ class SearchBar extends React.Component
           headerComponents={headerComponents}
           items={@state.suggestions}
           itemContent={itemContentFunc}
-          itemKey={ (item) -> item.id ? item.label }
+          itemKey={ (item) -> item.label || item.contact?.id || item.thread?.id}
           onSelect={@_onSelectSuggestion}
           />
       </div>
diff --git a/src/components/menu.cjsx b/src/components/menu.cjsx
index 1291b5558..376a444cc 100644
--- a/src/components/menu.cjsx
+++ b/src/components/menu.cjsx
@@ -250,11 +250,13 @@ class Menu extends React.Component
       event.preventDefault()
       @props.onSelect(item) if @props.onSelect
 
-    <MenuItem onMouseDown={onMouseDown}
-              key={@props.itemKey(item)}
-              checked={@props.itemChecked?(item)}
-              content={content}
-              selected={@state.selectedIndex is i} />
+    <MenuItem
+      onMouseDown={onMouseDown}
+      key={@props.itemKey(item)}
+      checked={@props.itemChecked?(item)}
+      content={content}
+      selected={@state.selectedIndex is i}
+    />
 
   _onShiftSelectedIndex: (delta) =>
     return if @props.items.length is 0