diff --git a/frontend/src/app/components/search-input/search-input.component.html b/frontend/src/app/components/search-input/search-input.component.html
index 81c6d07..b596e30 100644
--- a/frontend/src/app/components/search-input/search-input.component.html
+++ b/frontend/src/app/components/search-input/search-input.component.html
@@ -3,11 +3,11 @@
     <h2>When is your trip?</h2>
     <mat-form-field appearance="outline">
       <mat-label>Start</mat-label>
-      <input [(ngModel)]="from" matInput required type="date">
+      <input (change)="checkDates()" [(ngModel)]="from" [min]="today" matInput required type="date">
     </mat-form-field>
     <mat-form-field appearance="outline">
       <mat-label>End</mat-label>
-      <input [(ngModel)]="to" matInput required type="date">
+      <input (change)="checkDates()" [(ngModel)]="to" [min]="from" matInput required type="date">
     </mat-form-field>
   </section>
 
diff --git a/frontend/src/app/components/search-input/search-input.component.ts b/frontend/src/app/components/search-input/search-input.component.ts
index dc45174..12a1202 100644
--- a/frontend/src/app/components/search-input/search-input.component.ts
+++ b/frontend/src/app/components/search-input/search-input.component.ts
@@ -24,6 +24,8 @@ export class SearchInputComponent implements OnInit {
   singlePresetSelection = {};
   multiPresetSelection = {};
 
+  readonly today = this.from = formatDate(new Date(), 'yyyy-MM-dd', 'en-GB');
+
   constructor(private router: Router, private ps: PresetService, private ss: SearchService) {
     const from = new Date();
     const to = new Date();
@@ -94,4 +96,15 @@ export class SearchInputComponent implements OnInit {
       return true;
     }
   }
+
+  checkDates() {
+    const fromDate = new Date(this.from);
+    const toDate = new Date(this.to);
+
+    if (toDate <= fromDate) {
+      const newToDate = new Date(this.from);
+      newToDate.setDate(fromDate.getDate() + 1);
+      this.to = formatDate(newToDate, 'yyyy-MM-dd', 'en-GB');
+    }
+  }
 }