diff --git a/public/css/custom.css b/public/css/custom.css
index 463094660..10e1d247d 100644
--- a/public/css/custom.css
+++ b/public/css/custom.css
@@ -359,6 +359,11 @@ button:focus
     display : flex !important;
 }
 
+.form-group.d-none.show
+{
+    display : unset !important;
+}
+
 .btn .d-none.show
 {
     display : inherit !important;
diff --git a/resources/views/settings/default/edit.blade.php b/resources/views/settings/default/edit.blade.php
index 4970769f3..2d100b8b3 100644
--- a/resources/views/settings/default/edit.blade.php
+++ b/resources/views/settings/default/edit.blade.php
@@ -37,7 +37,7 @@
         @permission('update-settings-settings')
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons(URL::previous()) }}
+                    {{ Form::saveButtons('settings.index') }}
                 </div>
             </div>
         @endpermission
diff --git a/resources/views/settings/email/edit.blade.php b/resources/views/settings/email/edit.blade.php
index f042733ed..be22a2bd8 100644
--- a/resources/views/settings/email/edit.blade.php
+++ b/resources/views/settings/email/edit.blade.php
@@ -90,7 +90,7 @@
             <div class="card col-md-12">
                 <div class="card-body mr--3">
                     <div class="row float-right">
-                        {{ Form::saveButtons(URL::previous()) }}
+                        {{ Form::saveButtons('settings.index') }}
                     </div>
                 </div>
             </div>
diff --git a/resources/views/settings/invoice/edit.blade.php b/resources/views/settings/invoice/edit.blade.php
index 3f92baaa4..b281eb476 100644
--- a/resources/views/settings/invoice/edit.blade.php
+++ b/resources/views/settings/invoice/edit.blade.php
@@ -55,7 +55,7 @@
         @permission('update-settings-settings')
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons(URL::previous()) }}
+                    {{ Form::saveButtons('settings.index') }}
                 </div>
             </div>
         @endpermission
diff --git a/resources/views/settings/localisation/edit.blade.php b/resources/views/settings/localisation/edit.blade.php
index 3456058fb..9c0b0fa72 100644
--- a/resources/views/settings/localisation/edit.blade.php
+++ b/resources/views/settings/localisation/edit.blade.php
@@ -33,7 +33,7 @@
         @permission('update-settings-settings')
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons(URL::previous()) }}
+                    {{ Form::saveButtons('settings.index') }}
                 </div>
             </div>
         @endpermission
diff --git a/resources/views/settings/schedule/edit.blade.php b/resources/views/settings/schedule/edit.blade.php
index 754e67d4e..5195f44d3 100644
--- a/resources/views/settings/schedule/edit.blade.php
+++ b/resources/views/settings/schedule/edit.blade.php
@@ -38,7 +38,7 @@
         @permission('update-settings-settings')
             <div class="card-footer">
                 <div class="row float-right">
-                    {{ Form::saveButtons(URL::previous()) }}
+                    {{ Form::saveButtons('settings.index') }}
                 </div>
             </div>
         @endpermission