diff --git a/projects/go-lib/src/lib/components/go-datepicker/go-datepicker.component.html b/projects/go-lib/src/lib/components/go-datepicker/go-datepicker.component.html
index aba770d2e..6fdb64ea1 100644
--- a/projects/go-lib/src/lib/components/go-datepicker/go-datepicker.component.html
+++ b/projects/go-lib/src/lib/components/go-datepicker/go-datepicker.component.html
@@ -17,6 +17,8 @@
     [(ngModel)]="selectedDate"
     (blur)="validateDate()"
     [disabled]="control.disabled"
+    (input)="closeCalendar()"
+    (click)="toggleDatepicker($event)"
   />
   <go-icon-button
     class="go-datepicker__toggle"
diff --git a/projects/go-lib/src/lib/components/go-datepicker/go-datepicker.component.ts b/projects/go-lib/src/lib/components/go-datepicker/go-datepicker.component.ts
index 1c0bf6ff4..e8306ec3c 100644
--- a/projects/go-lib/src/lib/components/go-datepicker/go-datepicker.component.ts
+++ b/projects/go-lib/src/lib/components/go-datepicker/go-datepicker.component.ts
@@ -118,4 +118,10 @@ export class GoDatepickerComponent extends GoFormBaseComponent implements OnDest
   private initializePlaceholder(): void {
     this.placeholder = this.placeholder || LocaleFormat.format(this.locale);
   }
+
+  closeCalendar() {
+    if (this.goCalendar.isOpen) {
+      this.goCalendar.closeCalendar();
+    }
+  }
 }