diff --git a/resources/views/parts/searchbar.blade.php b/resources/views/parts/searchbar.blade.php
index bd3da70a41a00925260ae25be33922ba2c14ada3..9e19e769cad5ca35c7338c4904caf7fe52390c04 100644
--- a/resources/views/parts/searchbar.blade.php
+++ b/resources/views/parts/searchbar.blade.php
@@ -21,7 +21,7 @@
 				</button>
 			</div>
 			<div class="search-settings">
-				<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings ") }}">
+				<a id="settings-btn" class="mutelink btn btn-default" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "settings") }}">
 					<i class="fa fa-cog" aria-hidden="true"></i>
 				</a>
 			</div>
diff --git a/resources/views/settings.blade.php b/resources/views/settings.blade.php
index 5b7b976ab900230d1868f73cfb51df436ecc01aa..02b79c3e8e5518a77de0bafed89ff5fa440ec222 100644
--- a/resources/views/settings.blade.php
+++ b/resources/views/settings.blade.php
@@ -56,7 +56,7 @@
 				<input type="text" class="form-control settings-form-control" name="param_key" placeholder="@lang('settings.key.placeholder')">
 			</div>
 		<div id="settings-buttons">
-			<a id="settings-abort-btn" class="btn btn-danger mutelink" href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}">@lang('settings.abort') <i class="fa fa-times" aria-hidden="true"></i></a>
+			<a id="settings-abort-btn" class="btn btn-danger mutelink" href="{{ URL::previous() }}">@lang('settings.abort') <i class="fa fa-times" aria-hidden="true"></i></a>
 			<input id="unten" class="btn btn-primary" type="submit" value="{!! trans('settings.speichern.1') !!}">
 			<input id="save" class="btn btn-primary hidden" type="button" data-href="{{ LaravelLocalization::getLocalizedURL(LaravelLocalization::getCurrentLocale(), "/") }}" value="{!! trans('settings.speichern.2') !!}">
 			<input id="plugin" class="btn btn-primary" type="submit" value="{!! trans('settings.speichern.3') !!}">