diff --git a/spec-inbox/components/tokenizing-text-field-spec.cjsx b/spec-inbox/components/tokenizing-text-field-spec.cjsx
index a8652fa83..8a9b6b70d 100644
--- a/spec-inbox/components/tokenizing-text-field-spec.cjsx
+++ b/spec-inbox/components/tokenizing-text-field-spec.cjsx
@@ -7,7 +7,7 @@ ReactTestUtils = React.addons.TestUtils
  NamespaceStore,
  Contact,
 } = require 'inbox-exports'
-{TokenizingTextField} = require 'ui-components'
+{TokenizingTextField, Menu} = require 'ui-components'
 
 me = new Namespace
   name: 'Test User'
@@ -109,11 +109,26 @@ describe 'TokenizingTextField', ->
     it 'should not display items with keys matching items already in the token field', ->
       @completions = [participant2, participant4, participant1]
       ReactTestUtils.Simulate.change(@renderedInput, {target: {value: 'abc'}})
-      
+
       components = ReactTestUtils.scryRenderedComponentsWithType(@renderedField, CustomSuggestion)
       expect(components.length).toBe(1)
       expect(components[0].props.item).toBe(participant4)
-  
+
+    it 'should highlight the first completion', ->
+      @completions = [participant4, participant5]
+      ReactTestUtils.Simulate.change(@renderedInput, {target: {value: 'abc'}})
+      components = ReactTestUtils.scryRenderedComponentsWithType(@renderedField, Menu.Item)
+      menuItem = components[0]
+      expect(menuItem.props.selected).toBe true
+
+    it 'select the clicked element', ->
+      @completions = [participant4, participant5]
+      ReactTestUtils.Simulate.change(@renderedInput, {target: {value: 'abc'}})
+      components = ReactTestUtils.scryRenderedComponentsWithType(@renderedField, Menu.Item)
+      menuItem = components[0]
+      ReactTestUtils.Simulate.mouseDown(menuItem.getDOMNode())
+      expect(@propAdd).toHaveBeenCalledWith(participant4)
+
   ['enter', ','].forEach (key) ->
     describe "when the user presses #{key}", ->
       describe "and there is an completion available", ->
diff --git a/src/components/menu.cjsx b/src/components/menu.cjsx
index a1d62f2dd..acd6e3fca 100644
--- a/src/components/menu.cjsx
+++ b/src/components/menu.cjsx
@@ -69,7 +69,7 @@ MenuItem = React.createClass
     else
       className = "item"
       className += " selected" if @props.selected
-      <div className={className} key={@props.key} onClick={@props.onClick}>{@props.content}</div>
+      <div className={className} key={@props.key} onMouseDown={@props.onMouseDown}>{@props.content}</div>
 
 
 Menu = React.createClass
@@ -85,11 +85,11 @@ Menu = React.createClass
     onSelect: React.PropTypes.func.isRequired,
 
   getInitialState: ->
-    selectedIndex: -1
+    selectedIndex: 0
 
   getSelectedItem: ->
     @props.items[@state.selectedIndex]
-    
+
   componentDidMount: ->
     @subscriptions = new CompositeDisposable()
     @subscriptions.add atom.commands.add '.menu', {
@@ -108,11 +108,11 @@ Menu = React.createClass
       selectionKey = @props.itemKey(selection)
       newSelection = _.find newProps.items, (item) => @props.itemKey(item) is selectionKey
 
-    newSelectionIndex = -1
-    newSelectionIndex = newProps.items.indexOf(newSelection) if newSelection?
+      newSelectionIndex = -1
+      newSelectionIndex = newProps.items.indexOf(newSelection) if newSelection?
 
-    @setState
-      selectedIndex: newSelectionIndex
+      @setState
+        selectedIndex: newSelectionIndex
 
   componentWillUnmount: ->
     @subscriptions?.dispose()
@@ -140,12 +140,12 @@ Menu = React.createClass
     content = @props.itemContent(item)
     return content if content.type is MenuItem.type
 
-    onClick = (event) =>
+    onMouseDown = (event) =>
       event.preventDefault()
       @props.onSelect(item) if @props.onSelect
 
-    <MenuItem onClick={onClick} 
-              key={@props.itemKey(item)} 
+    <MenuItem onMouseDown={onMouseDown}
+              key={@props.itemKey(item)}
               content={content}
               selected={@state.selectedIndex is i} />