diff --git a/goofy-client/apps/goofy-e2e/src/components/vorgang/vorgang-search.e2e.component.ts b/goofy-client/apps/goofy-e2e/src/components/vorgang/vorgang-search.e2e.component.ts
index acb6a8b3347a9063df5c6e7daf97f02cb023b92b..46102ab7dfbfeeb69004e0776270ff7ab13abd11 100644
--- a/goofy-client/apps/goofy-e2e/src/components/vorgang/vorgang-search.e2e.component.ts
+++ b/goofy-client/apps/goofy-e2e/src/components/vorgang/vorgang-search.e2e.component.ts
@@ -25,7 +25,7 @@ import { convertToDataTestId } from "../../support/tech.util";
 
 export class VorgangSearchE2EComponent {
 
-	//private readonly locatorButton: string = 'search-button';
+	private readonly locatorButton: string = 'search-button';
 	private readonly locatorInput: string = 'search-input';
 	private readonly locatorForm: string = 'search-form';
 	private readonly locatorSearchPreviewList: string = 'search-preview-list';
@@ -41,10 +41,9 @@ export class VorgangSearchE2EComponent {
 		return cy.getTestElement(this.locatorInput);
 	}
 
-	//FIXME klaeren wie mit dem ausgebauten Button umgegangen werden soll
-	// public search(): void {
-	// 	cy.getTestElement(this.locatorButton).click();
-	// }
+	public getSearchButton() {
+		return cy.getTestElement(this.locatorButton);
+	}
 
 	public getForm() {
 		return cy.getTestElement(this.locatorForm);
diff --git a/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-list/vorgang-list.search.e2e-spec.ts b/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-list/vorgang-list.search.e2e-spec.ts
index 958e022ca5cb5e97bbacc4d48178657b8953f32e..7956376a3b8972defc5fba5a3b4984f76025dc9e 100644
--- a/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-list/vorgang-list.search.e2e-spec.ts
+++ b/goofy-client/apps/goofy-e2e/src/integration/main-tests/vorgang-list/vorgang-list.search.e2e-spec.ts
@@ -67,7 +67,7 @@ describe('VorgangList Suche', () => {
 
 		after(() => {
 			dropCollections();
-		})
+		});
 
 		it('should filter list', () => {
 			doSearchWith(vorgangToStay.name);
@@ -273,7 +273,7 @@ describe('VorgangList Suche', () => {
 			initVorgaenge([vorgangStayByVorgangName, vorgangStayByAktenzeichen, vorgangStayByAntragstellerVorname, vorgangStayByAntragstellerNachname, vorgangStayByRequestId])
 			initSearchIndex([vorgangStayByVorgangName, vorgangStayByAktenzeichen, vorgangStayByAntragstellerVorname, vorgangStayByAntragstellerNachname, vorgangStayByRequestId])
 
-			loginAsSabine();;
+			loginAsSabine();
 
 			waitForSpinnerToDisappear();
 			exist(vorgangList.getRoot());
@@ -353,6 +353,17 @@ describe('VorgangList Suche', () => {
 				notExist(byVorgangName.getRoot());
 			})
 		})
+	});
+
+	describe('leave search field', () => {
+		it('without submit should set previously entered text', () => {
+			doSearchWith('Gewerbe');
+
+			mainPage.getVorgangSearch().getInput().clear().type('Gewe');
+			mainPage.getHeader().getNavigationToggle().click();
+
+			haveValue(mainPage.getVorgangSearch().getInput(), 'Gewerbe');
+		});
 	})
 
 	function doSearchWith(searchBy: string): void {
diff --git a/goofy-client/apps/goofy-e2e/src/page-objects/header.po.ts b/goofy-client/apps/goofy-e2e/src/page-objects/header.po.ts
index 69276520aaa1634e2f3851e448876cf70b36754d..497a51e0e0e2b0ea82aa67144eb7bdf47f9c79e7 100644
--- a/goofy-client/apps/goofy-e2e/src/page-objects/header.po.ts
+++ b/goofy-client/apps/goofy-e2e/src/page-objects/header.po.ts
@@ -28,6 +28,7 @@ export class HeaderE2EComponent {
 
 	private readonly locatorTitle: string = 'title';
 	private readonly locatorRoot: string = 'header';
+	private readonly locatorNavigationToggle: string = 'navigation-toggle';
 
 	private readonly userSettings: UserSettingsE2EComponent = new UserSettingsE2EComponent();
 	private readonly currentUserProfile: CurrentUserProfileE2EComponent = new CurrentUserProfileE2EComponent();
@@ -47,4 +48,8 @@ export class HeaderE2EComponent {
 	public getCurrentUserProfile(): CurrentUserProfileE2EComponent {
 		return this.currentUserProfile;
 	}
+
+	public getNavigationToggle() {
+		return cy.getTestElement(this.locatorNavigationToggle);
+	}
 }
\ No newline at end of file
diff --git a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
index 0fcca3bec30131bde81a015002b2f10255ab928c..30f11b01a16f436b5666ae02460bdd496c0a86b5 100644
--- a/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
+++ b/goofy-client/libs/navigation/src/lib/header-container/header/header.component.html
@@ -26,6 +26,7 @@
 <header data-test-id="header">
 	<div class="left">
 		<goofy-client-icon-button-with-spinner
+			data-test-id="navigation-toggle"
 			icon="menu" toolTip="Hauptmenü umschalten"
 			(clickEmitter)="toggleMenuEvent.emit(!this.navigationCollapse)">
 		</goofy-client-icon-button-with-spinner>