diff --git a/plugins/tasklist/localization/en_US.inc b/plugins/tasklist/localization/en_US.inc
index ba331bec..ae414034 100644
--- a/plugins/tasklist/localization/en_US.inc
+++ b/plugins/tasklist/localization/en_US.inc
@@ -49,7 +49,7 @@ $labels['editlist'] = 'Edit list';
 $labels['createlist'] = 'Add list';
 $labels['listactions'] = 'List options...';
 $labels['listname'] = 'Name';
-$labels['showalarms'] = 'Show alarms';
+$labels['showalarms'] = 'Show reminders';
 $labels['import'] = 'Import';
 $labels['viewoptions'] = 'View options';
 $labels['focusview'] = 'View only this list';
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index b2829ffb..f7da8d3d 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -1465,12 +1465,7 @@ function rcube_tasklist_ui(settings)
         if (!rec || rec.readonly || rcmail.busy)
             return false;
 
-        var html, buttons = [{
-            text: rcmail.gettext('cancel', 'tasklist'),
-            click: function() {
-                $(this).dialog('close');
-            }
-        }];
+        var html, buttons = [];
 
         if (rec.children && rec.children.length) {
             html = rcmail.gettext('deleteparenttasktconfirm','tasklist');
@@ -1500,6 +1495,13 @@ function rcube_tasklist_ui(settings)
             });
         }
 
+        buttons.push({
+            text: rcmail.gettext('cancel', 'tasklist'),
+            click: function() {
+                $(this).dialog('close');
+            }
+        });
+
         var $dialog = $('<div>').html(html);
         $dialog.dialog({
           modal: true,