diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 750365ff..e984e600 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -354,6 +354,9 @@ function rcube_calendar_ui(settings)
         resizable: !bw.ie6,
         closeOnEscape: (!bw.ie6 && !bw.ie7),  // disable for performance reasons
         title: Q(me.event_date_text(event)),
+        open: function() {
+          $dialog.parent().find('.ui-button').first().focus();
+        },
         close: function() {
           $dialog.dialog('destroy').hide();
         },
@@ -835,6 +838,9 @@ function rcube_calendar_ui(settings)
         resizable: true,
         closeOnEscape: (!bw.ie6 && !bw.ie7),
         title: rcmail.gettext('scheduletime', 'calendar'),
+        open: function() {
+          $dialog.parent().find('.ui-dialog-buttonset .ui-button').first().focus();
+        },
         close: function() {
           if (bw.ie6)
             $("#edit-attendees-table").css('visibility','visible');
diff --git a/plugins/tasklist/tasklist.js b/plugins/tasklist/tasklist.js
index d923070e..0b394944 100644
--- a/plugins/tasklist/tasklist.js
+++ b/plugins/tasklist/tasklist.js
@@ -902,6 +902,9 @@ function rcube_tasklist_ui(settings)
           resizable: true,
           closeOnEscape: true,
           title: rcmail.gettext('taskdetails', 'tasklist'),
+          open: function() {
+            $dialog.parent().find('.ui-button').first().focus();
+          },
           close: function() {
               $dialog.dialog('destroy').appendTo(document.body);
           },