diff --git a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
index 3f96aac..a5d266c 100644
--- a/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
+++ b/projects/grid-failure-information-app/src/app/pages/grid-failure/grid-failure-details/grid-failure-details.component.html
@@ -118,7 +118,7 @@
     </div>
   </div>
   <div class="grid-failure-grid-wrapper" body>
-    <form [ngrxFormState]="formState">
+    <form [ngrxFormState]="formState" (keydown.enter)="$event.preventDefault()">
       <div *ngIf="(gridFailureVersions$ | async).length">
         <label> {{ 'GridFailure.Version' | translate }}</label>
         <select
@@ -579,9 +579,11 @@
                       [ngbTypeahead]="gridFailureDetailsSandbox.searchForStation"
                       [resultFormatter]="gridFailureDetailsSandbox.formatter"
                       [inputFormatter]="gridFailureDetailsSandbox.formatter"
+                      (keydown.enter)="postSelectedStationButton.click()"
                     />
                   </div>
                   <button
+                    #postSelectedStationButton
                     type="button"
                     class="btn btn-primary btn-sm"
                     (click)="gridFailureDetailsSandbox.postSelectedStation(); clearSearchInput()"