     switch e.which
       when 8
         @props.onRemove choiceID
+      when 38
+        index = @choiceButtons.indexOf document.activeElement
+        newIndex = index - 1
+        if newIndex is -1 then newIndex = @choiceButtons.length - 1
+        @choiceButtons[newIndex].focus()
+        e.preventDefault()
+      when 40
+        index = @choiceButtons.indexOf document.activeElement
+        newIndex = (index + 1) % @choiceButtons.length
+        @choiceButtons[newIndex].focus()
+        e.preventDefault()
       else
         true
     

            <button
              autoFocus={choiceID is @props.focusedChoice}
              key={choiceID + i}
              type="button"
              className="survey-task-chooser-choice-button #{'survey-task-chooser-choice-button-chosen' if chosenAlready}"
              onClick={@props.onChoose.bind null, choiceID}

      3

  render: ->
    @choiceButtons = []

    filteredChoices = @getFilteredChoices()

    thumbnailSize = @whatSizeThumbnails filteredChoices
