diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 6d4f30bc..2704b4a9 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -508,6 +508,8 @@ class calendar extends rcube_plugin
       $this->rc->output->show_message($error_msg, 'error');
     }
 
+    $this->rc->output->command('plugin.unlock_saving');
+
     // TODO: keep view and date selection
     if ($success && $reload)
       $this->rc->output->redirect('');
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index 1933b07b..af8fbb40 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -1625,6 +1625,7 @@ function rcube_calendar_ui(settings)
         if (calendar.id)
           data.id = calendar.id;
 
+        me.saving_lock = rcmail.set_busy(true, 'calendar.savingdata');
         rcmail.http_post('calendar', { action:(calendar.id ? 'edit' : 'new'), c:data });
         $dialog.dialog("close");
       };