diff --git a/css/style.scss b/css/style.scss
index 58611c8a5..3fcfe6576 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -569,13 +569,13 @@ input.input-inline {
 
 		.timepicker-input {
 			width: 50px;
+			border-left: 0;
 			border-radius: 0px 3px 3px 0px;
 		}
 
 		.datepicker-input {
 			width: 85px;
 			margin: 3px 0px;
-			border-right: 0;
 			border-radius: 3px 0px 0px 3px;
 		}
 
diff --git a/templates/part.card.php b/templates/part.card.php
index 67ebe73d6..93026e0b1 100644
--- a/templates/part.card.php
+++ b/templates/part.card.php
@@ -52,7 +52,7 @@
 	</h3>
 	<div class="duedate">
 		<input class="datepicker-input medium focus" type="text" placeholder="<?php p($l->t('Click to set')); ?>" value="{{ cardservice.getCurrent().duedate | parseDate }}" datepicker="due" />
-		<input class="timepicker-input medium focus" type="text" placeholder="00:00:00" ng-if="cardservice.getCurrent().duedate" value="{{ cardservice.getCurrent().duedate | parseTime }}" timepicker="due" />
+		<input class="timepicker-input medium focus" type="text" placeholder="00:00" ng-disabled="!cardservice.getCurrent().duedate" value="{{ cardservice.getCurrent().duedate | parseTime }}" timepicker="due" />
 		<button class="icon icon-delete button-inline" title="<?php p($l->t('Remove due date')); ?>" ng-if="cardservice.getCurrent().duedate" ng-click="resetDuedate()"></button>
 	</div>