activate highlighter on pickColor

app/assets/javascripts/app/controllers/layout_ref.js.coffee

@@ -872,11 +872,17 @@ class highlightRef extends App.ControllerContent
 
   toggleHighlight: (e) =>
     if @isActive
+      @deactivate()
+    else
+      @activate()
+
+  deactivate: ->
     @highlightIcon.css('fill', '')
     @isActive = false
     @articles.off('mouseup', @onMouseUp)
     @articles.removeAttr('data-highlightcolor')
-    else
+
+  activate: ->
     selection = rangy.getSelection()
     # if there's already something selected, 
     # don't go into highlight mode
@@ -898,7 +904,9 @@ class highlightRef extends App.ControllerContent
     $(e.currentTarget).find('.visibility-change').addClass('is-active')
     @activeColorIndex = $(e.currentTarget).attr('data-key')
 
-    if @isActive
+    if not @isActive
+      @activate()
+    else
       @highlightIcon.css('fill', @colors[@activeColorIndex].color)
 
     @setColor()