diff --git a/resources/assets/less/metager/foki.less b/resources/assets/less/metager/foki.less
index ad35762b29b2e4cb644348c2cfead69971630a04..292e8f6630270bcb61025b794d033f84257a4aeb 100644
--- a/resources/assets/less/metager/foki.less
+++ b/resources/assets/less/metager/foki.less
@@ -1,9 +1,5 @@
 /* Rund ums Fokus Modal */
 
-.focus-input {
-    display: none;
-}
-
 #show-create-focus:checked {
     & + #create-focus-modal {
         display: flex;
diff --git a/resources/views/modals/create-focus-modal.blade.php b/resources/views/modals/create-focus-modal.blade.php
index dbdf73cf41f822d4e25e6a72ee7e2045cdd4e5f0..cdacb451a217cca503a5c4973bf1fef932ace12c 100644
--- a/resources/views/modals/create-focus-modal.blade.php
+++ b/resources/views/modals/create-focus-modal.blade.php
@@ -1,4 +1,5 @@
-<input type="checkbox" id="show-create-focus" class="focus-input">
+{{-- TODO HIDDEN INPUT-FIELD fürs Modal in dem die vorherige Eingabe steht, eigenes <form> tag fürs Modal  --}}
+<input type="checkbox" id="show-create-focus" class="hidden">
 <div id="create-focus-modal" tab-index="-1" role="dialog">
 	<div id="foki-modal-dialog">
 		<div id="foki-modal-content">
@@ -10,38 +11,40 @@
 				<p class="text-muted">@lang("index.focus-creator.description")</p>
 			</div>
 			<div class="modal-body">
-				<input type="hidden" form="searchForm" name="focus" @if(isset($focusPages) && !empty($focusPages)) value="focus_custom"@else value="web" @endif 
-																								id="custom-focus-flag" class="focus-input">
-				@foreach( App\Http\Controllers\FokiLoader::loadFoki() as $fokus => $sumas )
-					<div class="headingGroup {{ $fokus }}">
-						<input type="checkbox" id="toggle-{{ $fokus }}-dropdown" class="focus-dropdown-toggle">
-						<label for="toggle-{{ $fokus }}-dropdown" class="focus-category focus-dropdown-label h3">
-							@lang("settings.foki." . $fokus)
-						</label>
-						<div class="row">
-							@foreach( $sumas as $name => $data )
-							<div class="col-sm-6 col-md-4 col-lg-3">
-								<div class="checkbox settings-checkbox">
-									<label>
-										<input type="checkbox" form="searchForm" name="engine_{{ strtolower($name) }}" class="focusCheckbox" @if(isset($focusPages) && in_array(strtolower($name), $focusPages)) checked @endif>
-										{{ $data['displayName'] }}
-										<a class="settings-icon" target="_blank" rel="noopener" href="{{ $data['url'] }}">
-											<i class="fa fa-link" aria-hidden="true"></i>
-										</a>
-									</label>
+				<form id="customSearchForm" method="GET" action="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/meta/meta.ger3 ") }}" accept-charset="UTF-8">
+					<input type="hidden" name="focus" value="focus_custom" id="custom-focus-flag">
+					<input type="hidden" name="eingabe" value="@if(isset($eingabe)){{$eingabe}}@endif">																				
+					@foreach( App\Http\Controllers\FokiLoader::loadFoki() as $fokus => $sumas )
+						<div class="headingGroup {{ $fokus }}">
+							<input type="checkbox" id="toggle-{{ $fokus }}-dropdown" class="focus-dropdown-toggle">
+							<label for="toggle-{{ $fokus }}-dropdown" class="focus-category focus-dropdown-label h3">
+								@lang("settings.foki." . $fokus)
+							</label>
+							<div class="row">
+								@foreach( $sumas as $name => $data )
+								<div class="col-sm-6 col-md-4 col-lg-3">
+									<div class="checkbox settings-checkbox">
+										<label>
+											<input type="checkbox" name="engine_{{ strtolower($name) }}" class="focusCheckbox" @if(isset($focusPages) && in_array(strtolower($name), $focusPages)) checked @endif>
+											{{ $data['displayName'] }}
+											<a class="settings-icon" target="_blank" rel="noopener" href="{{ $data['url'] }}">
+												<i class="fa fa-link" aria-hidden="true"></i>
+											</a>
+										</label>
+									</div>
 								</div>
+								@endforeach
 							</div>
-							@endforeach
+						</div>
+					@endforeach
+					<div class="clearfix">
+						<div class="settings-modal-buttons pull-right">
+							<button type="submit" class="save-focus-btn btn btn-primary">
+								@lang('index.focus-creator.save')
+							</button>
 						</div>
 					</div>
-				@endforeach
-				<div class="clearfix">
-					<div class="settings-modal-buttons pull-right">
-						<button type="submit" form="searchForm" class="save-focus-btn btn btn-primary">
-							@lang('index.focus-creator.save')
-						</button>
-					</div>
-				</div>
+				</form>
 			</div>
 		</div>
 	</div>