diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 68be7c59d0..09787cf603 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -7,8 +7,8 @@
 	</template>
 	<template id="infolog.index.dates" template="" lang="" group="0" version="1.9.001">
 		<hbox>
-			<date id="startdate" label="Start"/>
-			<date id="enddate" label="End"/>
+			<date id="startdate" label="Start" onchange="widget.getParent().getWidgetById('enddate').set_min(widget.getValue());"/>
+			<date id="enddate" label="End" onchange="widget.getParent().getWidgetById('startdate').set_max(widget.getValue());"/>
 		</hbox>
 	</template>
 	<template id="infolog.index.rows" template="" lang="" group="0" version="1.9.005">
diff --git a/timesheet/templates/default/index.xet b/timesheet/templates/default/index.xet
index 8c14632aab..5f53622cff 100644
--- a/timesheet/templates/default/index.xet
+++ b/timesheet/templates/default/index.xet
@@ -5,9 +5,9 @@
 	<template id="timesheet.index.dates" template="" lang="" group="0" version="1.2.001" >
 		<hbox>
 			<description value="Start"/>
-			<date id="startdate"/>
+			<date id="startdate" onchange="widget.getParent().getWidgetById('enddate').set_min(widget.getValue());"/>
 			<description value="End"/>
-			<date statustext="Leave it empty for a full week" id="enddate"/>
+			<date statustext="Leave it empty for a full week" id="enddate"  onchange="widget.getParent().getWidgetById('startdate').set_max(widget.getValue());"/>
 		</hbox>
 	</template>
 	<template id="timesheet.index.add" template="" lang="" group="0" version="1.7.001">