diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 755243321c..7d5cb26a8d 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -121,14 +121,6 @@ module.exports.app = (appExports, model) ->
     target.removeClass(oldContext)
     target.addClass(newContext)
 
-  appExports.addTag = (e, el) ->
-    tagId = $(el).attr('data-tag-id')
-    taskId = $(el).attr('data-task-id')
-    console.log taskId
-    path = "_user.tasks.#{taskId}.tags.#{tagId}"
-    model.set path, !(model.get path)
-
-
   setUndo = (stats, task) ->
     previousUndo = model.get('_undo')
     clearTimeout(previousUndo.timeoutId) if previousUndo?.timeoutId
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 6be4daf116..f2140aae5a 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -224,6 +224,15 @@
                 </fieldset>
             {/}
 
+            <fieldset class='option-group'>
+                <select multiple="multiple">
+                    {{#each _user.tags as :tag}}
+                        <option selected="{:task.tags[:tag.id]}">{:tag.name}</option>
+                    {{/}}
+                </select>
+            </fieldset>
+
+
             <!-- Advanced Options -->
             {#unless equal(:task.type, 'reward')}
                 <p x-bind="click:tasksToggleAdvanced" class="option-title mega">Advanced Options</p>
@@ -237,20 +246,6 @@
                 </fieldset>
             {/}
 
-            <div class="control-group">
-                <div class="btn-group">
-                    <button class="btn dropdown-toggle" data-toggle="dropdown">
-                        Tags <span class="caret"></span>
-                    </button>
-                    <ul class="dropdown-menu">
-                        {{#each _user.tags as :tag}}
-                            <li class="{#if :task.tags[:tag.id]}active{/}">
-                                <a data-task-id="{{:task.id}}" data-tag-id="{:tag.id}" x-bind=click:addTag>{:tag.name}</a>
-                            </li>
-                        {{/}}
-                    </ul>
-                </div>
-            </div>
 
             <button type=submit class="task-action-btn tile spacious" x-bind="click:tasksSaveAndClose">Save & Close</button>
         </form>