diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index 28218b320d..698c32a319 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -744,7 +744,7 @@
 
       <!-- Content Wrapper. Contains page content -->
 
-      <div class="content-wrapper" role="main">
+      <div class="content-wrapper" role="main" id="setting-list">
 
           @if ($debug_in_production)
               <div class="row" style="margin-bottom: 0px; background-color: red; color: white; font-size: 15px;">
diff --git a/resources/views/settings/index.blade.php b/resources/views/settings/index.blade.php
index 6ea397cab7..0f6050d212 100755
--- a/resources/views/settings/index.blade.php
+++ b/resources/views/settings/index.blade.php
@@ -6,6 +6,24 @@
 @parent
 @stop
 
+@section('header_right')
+
+  <a href="{{ route('settings.index') }}" class="btn btn-primary text-right" style="margin-right: 10px;">{{ trans('general.back') }}</a>
+
+  <!-- search filter box -->
+  <div class="pull-right">
+    <form onsubmit="return false;">
+      <div class="btn-group">
+        <input id="searchinput" name="search" type="search" class="search form-control" placeholder="{{ trans('admin/settings/general.filter_by_keyword') }}">
+        <span id="searchclear" class="fas fa-times" aria-hidden="true"></span>
+        <button type="submit" disabled style="display: none" aria-hidden="true"></button>
+      </div>
+    </form>
+  </div>
+  <!--/ search filter box -->
+@stop
+
+
 {{-- Page content --}}
 @section('content')
 
@@ -28,20 +46,6 @@
     }
   </style>
 
-  <div class="row" id="setting-list">
-
-    <!-- search filter box -->
-    <div class="col-md-3 col-md-offset-9 form-group">
-      <form onsubmit="return false;">
-        <div class="btn-group">
-          <input id="searchinput" name="search" type="search" class="search form-control" placeholder="{{ trans('admin/settings/general.filter_by_keyword') }}">
-          <span id="searchclear" class="fas fa-times" aria-hidden="true"></span>
-          <button type="submit" disabled style="display: none" aria-hidden="true"></button>
-        </div>
-      </form>
-    </div>
-    <!--/ search filter box -->
-
 
     <!-- search filter list -->
     <div class="list">
@@ -386,11 +390,11 @@
     valueNames: [ 'name', 'keywords', 'summary', 'help-block']
   };
 
-  var userList = new List('setting-list', options);
+  var settingList = new List('setting-list', options);
 
   $("#searchclear").click(function(){
     $("#searchinput").val('');
-    userList.search();
+    settingList.search();
   });