diff --git a/src/app/tasks.coffee b/src/app/tasks.coffee
index 095314b0f7..f5c307bb4d 100644
--- a/src/app/tasks.coffee
+++ b/src/app/tasks.coffee
@@ -16,6 +16,12 @@ module.exports.app = (appExports, model) ->
 
     activeFilters = _.reduce user.get('filters'), ((memo,v,k) -> memo[k]=v if v;memo), {}
     newTask = {id: model.id(), type: type, text: text, notes: '', value: 0, tags: activeFilters}
+
+    isChallenge = e.at().path().indexOf('_challenge.new') != -1
+    if isChallenge
+      activeFilters = {}
+      newTask.challenge = model.get '_challenge.new.id'
+
     switch type
       when 'habit'
         newTask = _.defaults {up: true, down: true}, newTask
diff --git a/views/app/tasks.html b/views/app/tasks.html
index 6996b68382..e6b2083618 100644
--- a/views/app/tasks.html
+++ b/views/app/tasks.html
@@ -174,6 +174,8 @@
             <app:filters:applied-filters />
             <!-- edit -->
             <a x-bind=click:toggleTaskEdit data-hide-id="{{:task.id}}-chart" data-toggle-id="{{:task.id}}-edit" rel=tooltip title="Edit"><i class="icon-pencil"></i></a>
+            <!-- challenges -->
+            {{#if :task.challenge}}<i class='icon-bullhorn' rel=tooltip title="Challenge Task"></i>{{/}}
             <!-- delete -->
             <a x-bind=click:del rel=tooltip title="Delete"><i class="icon-trash"></i></a>
             <!-- chart -->