diff --git a/public/js/directives/directives.js b/public/js/directives/directives.js
index 09eac8b5a1..796864c5e3 100644
--- a/public/js/directives/directives.js
+++ b/public/js/directives/directives.js
@@ -75,6 +75,8 @@ habitrpg
       controller: ['$scope', '$rootScope', function($scope, $rootScope){
         $scope.editTask = function(task){
           task._editing = !task._editing;
+          task._tags = User.user.preferences.tagsCollapsed;
+          task._advanced = User.user.preferences.advancedCollapsed;
           if($rootScope.charts[task.id]) $rootScope.charts[task.id] = false;
         };
       }],
diff --git a/src/models/user.js b/src/models/user.js
index a4e0d95512..ef8a8b3e18 100644
--- a/src/models/user.js
+++ b/src/models/user.js
@@ -229,7 +229,9 @@ var UserSchema = new Schema({
     sleep: {type: Boolean, 'default': false},
     stickyHeader: {type: Boolean, 'default': true},
     disableClasses: {type: Boolean, 'default': false},
-    newTaskEdit: {type: Boolean, 'default': false}
+    newTaskEdit: {type: Boolean, 'default': false},
+    tagsCollapsed: {type: Boolean, 'default': false},
+    advancedCollapsed: {type: Boolean, 'default': false}
   },
   profile: {
     blurb: String,
diff --git a/views/options/settings.jade b/views/options/settings.jade
index 8aec7dfce0..edf3ca33d1 100644
--- a/views/options/settings.jade
+++ b/views/options/settings.jade
@@ -43,6 +43,14 @@ script(type='text/ng-template', id='partials/options.settings.settings.html')
         input(type='checkbox', ng-model='user.preferences.newTaskEdit', ng-change='set({"preferences.newTaskEdit": user.preferences.newTaskEdit?true: false})')
         | Open new tasks in edit mode 
         i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover='With this option set, new tasks will immediately open for you to add details like notes and tags.')
+      label.checkbox
+        input(type='checkbox', ng-model='user.preferences.tagsCollapsed', ng-change='set({"preferences.tagsCollapsed": user.preferences.tagsCollapsed?true: false})')
+        | Tag list in tasks starts collapsed 
+        i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover='With this option set, the list of task tags will be hidden when you first open a task for editing.')
+      label.checkbox
+        input(type='checkbox', ng-model='user.preferences.advancedCollapsed', ng-change='set({"preferences.advancedCollapsed": user.preferences.advancedCollapsed?true: false})')
+        | Advanced Options in tasks start collapsed 
+        i.icon-question-sign(popover-trigger='mouseenter', popover-placement='right', popover='With this option set, Advanced Options will be hidden when you first open a task for editing.')
       button.btn(ng-click='showTour()', popover-placement='right', popover-trigger='mouseenter', popover='Restart the introductory tour from when you first joined HabitRPG.') Show Tour
       br
       button.btn(ng-click='showBailey()', popover-trigger='mouseenter', popover-placement='right', popover='Bring Bailey the Town Crier out of hiding so you can review past news.') Show Bailey
diff --git a/views/shared/tasks/task.jade b/views/shared/tasks/task.jade
index 16e963979f..1546e08faa 100644
--- a/views/shared/tasks/task.jade
+++ b/views/shared/tasks/task.jade
@@ -170,9 +170,10 @@ li(bindonce='list', bo-id='"task-"+task.id', ng-repeat='task in obj[list.type+"s
           legend.option-title=env.t('dueDate')
           input.option-content.datepicker(type='text', datepicker-popup='MM/dd/yyyy', ng-model='task.date')
 
+        // Tags
         fieldset.option-group(ng-if='!$state.includes("options.social.challenges")')
-          legend.option-title=env.t('tags')
-          label.checkbox(ng-repeat='tag in user.tags')
+          p.option-title.mega(ng-click='task._tags = !task._tags')=env.t('tags')
+          label.checkbox(ng-repeat='tag in user.tags', ng-class="{visuallyhidden: task._tags}")
             input(type='checkbox', ng-model='task.tags[tag.id]')
             markdown(ng-model='tag.name')