diff --git a/packages/stark-ui/src/modules/generic-search/components/generic-search/generic-search.component.spec.ts b/packages/stark-ui/src/modules/generic-search/components/generic-search/generic-search.component.spec.ts
index bcbaa030a8..65c5746bb9 100644
--- a/packages/stark-ui/src/modules/generic-search/components/generic-search/generic-search.component.spec.ts
+++ b/packages/stark-ui/src/modules/generic-search/components/generic-search/generic-search.component.spec.ts
@@ -22,6 +22,7 @@ import { StarkActionBarModule } from "../../../action-bar";
 })
 class TestSearchFormComponent implements StarkSearchFormComponent<any> {
 	public searchForm: FormGroup = new FormGroup({});
+	public readonly submitEvent: EventEmitter<void> = new EventEmitter<void>();
 	public workingCopyChanged = new EventEmitter<any>();
 
 	public createSearchForm(_searchCriteria: any): FormGroup {
diff --git a/showcase/src/app/demo-ui/pages/generic-search/components/demo-generic-search-form.component.html b/showcase/src/app/demo-ui/pages/generic-search/components/demo-generic-search-form.component.html
index d55b1878e5..b7c4f1d861 100644
--- a/showcase/src/app/demo-ui/pages/generic-search/components/demo-generic-search-form.component.html
+++ b/showcase/src/app/demo-ui/pages/generic-search/components/demo-generic-search-form.component.html
@@ -1,4 +1,4 @@
-<form fxLayout="row wrap" [formGroup]="searchForm">
+<form fxLayout="row wrap" [formGroup]="searchForm" (ngSubmit)="submitEvent.next()">
 	<!-- Year -->
 	<div fxFlex>
 		<mat-form-field>
@@ -27,4 +27,6 @@
 			<mat-option *ngFor="let option of movieOptions; trackBy: trackItemFn" [value]="option">{{ option }}</mat-option>
 		</mat-autocomplete>
 	</div>
+
+	<button [hidden]="true" type="submit">&nbsp;</button>
 </form>
diff --git a/showcase/src/app/demo-ui/pages/generic-search/components/demo-generic-search-form.component.ts b/showcase/src/app/demo-ui/pages/generic-search/components/demo-generic-search-form.component.ts
index b45e1dfcd1..b18337244f 100644
--- a/showcase/src/app/demo-ui/pages/generic-search/components/demo-generic-search-form.component.ts
+++ b/showcase/src/app/demo-ui/pages/generic-search/components/demo-generic-search-form.component.ts
@@ -31,6 +31,9 @@ export class DemoGenericSearchFormComponent implements OnInit, StarkSearchFormCo
 	@Output()
 	public readonly workingCopyChanged = new EventEmitter<HeroMovieSearchCriteria>();
 
+	@Output()
+	public readonly submitEvent: EventEmitter<void> = new EventEmitter<void>();
+
 	public yearOptions: number[] = [];
 	public heroOptions: string[] = [];
 	public movieOptions: string[] = [];