diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index 59bb54c8..313e50a1 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -233,6 +233,8 @@ function rcube_tasklist_ui(settings)
                     li.children('.childtasks:first').toggle();
                     $(e.target).toggleClass('collapsed').html(rec.collapsed ? '▶' : '▼');
                     rcmail.http_post('tasks/task', { action:'collapse', t:{ id:rec.id, list:rec.list }, collapsed:rec.collapsed?1:0 });
+                    if (e.shiftKey)  // expand/collapse all childs
+                        li.children('.childtasks:first .childtoggle.'+(rec.collapsed?'expanded':'collapsed')).click();
                     break;
 
                 case 'complete':