diff --git a/catalogue/search.pl b/catalogue/search.pl
index 756dd4c2a4..af822bf652 100755
--- a/catalogue/search.pl
+++ b/catalogue/search.pl
@@ -427,6 +427,7 @@ my $count = C4::Context->preference('numSearchResults') || 20;
 my $results_per_page = $params->{'count'} || $count;
 my $offset = $params->{'offset'} || 0;
 my $whole_record = $params->{'whole_record'} || 0;
+my $weight_search = $params->{'weight_search'} || 0;
 $offset = 0 if $offset < 0;
 my $page = $cgi->param('page') || 1;
 #my $offset = ($page-1)*$results_per_page;
@@ -446,7 +447,7 @@ my $searcher = Koha::SearchEngine::Search->new(
     $query_type
   )
   = $builder->build_query_compat( \@operators, \@operands, \@indexes, \@limits,
-    \@sort_by, $scan, $lang, { weighted_fields => !$cgi->param('advsearch'), whole_record => $whole_record });
+    \@sort_by, $scan, $lang, { weighted_fields => $weight_search, whole_record => $whole_record });
 
 $template->param( search_query => $query ) if C4::Context->preference('DumpSearchQueryTemplate');
 
diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl
index bd7961ffb3..fdc04b2c2e 100755
--- a/cataloguing/addbooks.pl
+++ b/cataloguing/addbooks.pl
@@ -74,7 +74,7 @@ if ($query) {
     my $searcher = Koha::SearchEngine::Search->new(
         { index => $Koha::SearchEngine::BIBLIOS_INDEX } );
     ( undef, $builtquery, undef, $query_cgi, undef, undef, undef, undef, undef, undef ) =
-      $builder->build_query_compat( undef, \@operands, undef, undef, undef, 0, $lang );
+      $builder->build_query_compat( undef, \@operands, undef, undef, undef, 0, $lang, { weighted_fields => 1 });
 
     $template->param( search_query => $builtquery ) if C4::Context->preference('DumpSearchQueryTemplate');
 
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
index 8c555441e1..afde713912 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tt
@@ -93,9 +93,13 @@
 <!-- BOOLEAN SEARCH OPTIONS -->
     <fieldset id="searchterms">
     <legend>Search for </legend>
-    [% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
-        <input type="checkbox" name="whole_record">
-        <label for="whole_record">Search entire MARC record</label>
+    [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
+        [% IF Koha.Preference('ElasticsearchMARCFormat') == 'ARRAY' %]
+            <input type="checkbox" name="whole_record">
+            <label for="whole_record">Search entire MARC record</label>
+        [% END %]
+        <input type="checkbox" name="weight_search" checked>
+        <label for="weight_search">Apply field weightings to search</label>
     [% END %]
     [% FOREACH search_box IN search_boxes_loop %]
         [% IF ( search_boxes_label ) %]<div style="text-indent: 4.5em;">[% ELSE %]<div>[% END %]
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
index c1f8b0d82b..35ba5b9f51 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc
@@ -158,6 +158,7 @@
                             <div id="opac-main-search">
                                 [% IF Koha.Preference('OpacCustomSearch') == '' %]
                                     <form name="searchform" method="get" action="/cgi-bin/koha/opac-search.pl" id="searchform">
+                                        <input type="hidden" name="weight_search" value="1">
                                         <div class="form-row align-items-center">
                                             <div class="col-sm-auto order-1 order-sm-1">
                                                 <label for="masthead_search"> Search
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
index 7e0aec5e0f..297b0ced9e 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt
@@ -30,6 +30,10 @@
                     <div id="booleansearch" class="maincontent">
                         <fieldset>
                             <legend>Search for:</legend>
+                            [% IF Koha.Preference('SearchEngine') == 'Elasticsearch' %]
+                                <input type="checkbox" name="weight_search" checked>
+                                <label for="weighted_search">Apply field weightings to search</label>
+                            [% END %]
                             [% IF ( expanded_options ) %]
                                 <div class="advanced-search-terms extended">
                             [% ELSE %]
diff --git a/opac/opac-search.pl b/opac/opac-search.pl
index cf2e9e966e..99f26685a8 100755
--- a/opac/opac-search.pl
+++ b/opac/opac-search.pl
@@ -532,6 +532,7 @@ $offset = 0 if $offset < 0;
 my $page = $cgi->param('page') || 1;
 $offset = ($page-1)*$results_per_page if $page>1;
 my $hits;
+my $weight_search = $cgi->param('weight_search') || 0;
 
 # Define some global variables
 my ($error,$query,$simple_query,$query_cgi,$query_desc,$limit,$limit_cgi,$limit_desc,$query_type);
@@ -562,7 +563,7 @@ if (C4::Context->preference('OpacSuppression')) {
     {
         suppress => $suppress,
         is_opac => 1,
-        weighted_fields => !$cgi->param('advsearch')
+        weighted_fields => $weight_search
     }
 );