diff --git a/calendar/js/app.js b/calendar/js/app.js
index e32efd5173..6738a5fb2e 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -1864,13 +1864,12 @@ app.classes.calendar = AppJS.extend(
 			{
 				if(state.state.view == 'day' && state.state.owner.length === 1 && !isNaN(state.state.owner) && state.state.owner[0] >= 0)
 				{
-					if(this.state.view !== 'day')
-					{
-						view.etemplates[0].widgetContainer.iterateOver(function(w) {
-							w.set_width(w.div.width() * 0.7);
-						},this,et2_calendar_timegrid);
-					}
-					$j(view.etemplates[1].DOMContainer).css("left","69%");
+					
+					view.etemplates[0].widgetContainer.iterateOver(function(w) {
+						w.set_width($j(view.etemplates[0].DOMContainer).width() * 0.69);
+					},this,et2_calendar_timegrid);
+								
+					$j(view.etemplates[1].DOMContainer).css({"left":"69%", "height":$j(framework.tabsUi.activeTab.contentDiv).height()+'px'});
 					// TODO: Maybe some caching here
 					this.egw.jsonq('calendar_uiviews::ajax_get_todos', [state.state.date, state.state.owner[0]], function(data) {
 						this.getWidgetById('label').set_value(data.label||'');
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 453d6c2a7d..d33cb1897d 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -595,7 +595,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 }
 .calendar_calDayTodos .calendar_calDayTodosTable {
 	overflow: auto;
-	max-height: 400px;
+	position: absolute;
+	top: 2em;
+	bottom: 8px;
 }
 .calendar_calDayTodos {
 	width: 98%;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 5f1c9c8590..38b02ff5bb 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -922,10 +922,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
   box-shadow: 1px 1px 1px rgba(0, 0, 0, 0.6);
   background-color: inherit;
 }
-.calendar_calDayTodos .calendar_calDayTodosTable {
-  overflow: auto;
-  max-height: 400px;
-}
 .calendar_calDayTodos .calendar_calDayTodosTable table tr:nth-child(even) {
   background: #ffffff;
 }
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 6cb622d8c0..8ac50463fa 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -1022,8 +1022,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     }
 }
 .calendar_calDayTodos .calendar_calDayTodosTable {
-    overflow: auto;
-    max-height: 400px;
 
     table {