diff --git a/addons/web_calendar/static/src/js/calendar.js b/addons/web_calendar/static/src/js/calendar.js
index fd5531b6271..6042ee2fd57 100644
--- a/addons/web_calendar/static/src/js/calendar.js
+++ b/addons/web_calendar/static/src/js/calendar.js
@@ -339,9 +339,10 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
             });
         }
     },
-    do_edit_event: function(event_id) {
+    do_edit_event: function(event_id, evt) {
         var self = this;
         var index = this.dataset.get_id_index(event_id);
+        debugger
         if (index !== null) {
             this.dataset.index = index;
             this.do_switch_view('page');
@@ -363,6 +364,8 @@ openerp.web_calendar.CalendarView = openerp.web.View.extend({
             // I tried scheduler.editStop(event_id); but doesn't work either
             // After losing one hour on this, here's a quick and very dirty fix :
             $(".dhx_cancel_btn").click();
+        } else {
+            scheduler.editStop($(evt.target).hasClass('icon_save'));
         }
     },
     get_event_data: function(event_obj) {