diff --git a/calendar/inc/class.calendar_uiforms.inc.php b/calendar/inc/class.calendar_uiforms.inc.php
index 92daddee18..0d84033922 100644
--- a/calendar/inc/class.calendar_uiforms.inc.php
+++ b/calendar/inc/class.calendar_uiforms.inc.php
@@ -2653,6 +2653,10 @@ class calendar_uiforms extends calendar_ui
 		{
 			$event['whole_day'] = ($duration == DAY_s);
 			$event['non_blocking'] = false;
+			// If there's a conflict, it won't save the change and the conflict popup will be blank
+			// so save the change now, and then let the conflict check happen.
+			$this->bo->update($event,true, true, false, true, $message,true);
+
 			// Whole day non blocking with DAY_s would add a day
 			if($duration==DAY_s) $duration=0;
 		}
diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index abd18daf65..023c4d8b73 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -144,6 +144,8 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
 				old_daywise.splice(old_daywise.indexOf(this.options.value.id),1);
 				egw.dataStoreUID(old_cache_id,old_daywise);				
 				egw.dataStoreUID(new_cache_id,new_daywise);
+				
+				this._parent.removeChild(this);
 			}
 
 			// Copy to avoid changes, which may cause nm problems