diff --git a/admin/columns_settings.yml b/admin/columns_settings.yml
index ab23de9603..e0708fc4c6 100644
--- a/admin/columns_settings.yml
+++ b/admin/columns_settings.yml
@@ -264,6 +264,9 @@ modules:
           columnname: item_current_location
         -
           columnname: item_home_location
+        -
+          columnname: item_shelving_location
+          is_hidden: 1
         -
           columnname: item_ccode
         -
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index b6954ef667..7c822449d0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -143,12 +143,13 @@ OPAC:
                   both: "home and holding libraries"
             - for items on the OPAC record details page.
         -
-            - Display the shelving location under the
-            - pref: OpacLocationBranchToDisplayShelving
+            - 'Display the shelving location '
+            - pref: OpacLocationOnDetail
               choices:
-                  home: "home library"
-                  holding: "holding library"
-                  both: "home and holding libraries"
+                  home: "below the home library"
+                  holding: "below the holding library"
+                  both: "below both home and holding libraries"
+                  column: "on a separate column"
             - for items on the OPAC record details page.
         -
             - pref: OpacKohaUrl
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
index af77f55660..1a2e4b56cc 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
@@ -1188,6 +1188,8 @@
                 <th id="item_home_location" data-colname="item_home_location" class="item_location">Home library</th>[% END %]
         [% IF ( itemdata_ccode ) %]
                 <th id="item_ccode" data-colname="item_ccode" class="collection">Collection</th>[% END %]
+        [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %]
+                <th id="item_shelving_location" data-colname="item_shelving_location" class="shelving_location">Shelving location</th>[% END %]
                 <th id="item_callnumber" data-colname="item_callnumber" class="call_no">Call number</th>
         [% IF ( itemdata_enumchron ) %]
                 <th id="item_enumchron" data-colname="item_enumchron" class="vol_info">Vol info</th>[% END %]
@@ -1240,7 +1242,7 @@
                             </span>
                             <div class="branch-info-tooltip">[% ITEM_RESULT.holding_branch_opac_info %]</div>
 
-                            [% IF ( OpacLocationBranchToDisplayShelving == 'holding' || OpacLocationBranchToDisplayShelving == 'both' ) %]
+                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'holding' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
                                 <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
                             [% END %]
 
@@ -1265,7 +1267,7 @@
                             </span>
                             <div class="branch-info-tooltip">[% ITEM_RESULT.home_branch_opac_info %]</div>
 
-                            [% IF ( OpacLocationBranchToDisplayShelving == 'home' || OpacLocationBranchToDisplayShelving == 'both' ) %]
+                            [% IF ( Koha.Preference('OpacLocationOnDetail') == 'home' || Koha.Preference('OpacLocationOnDetail') == 'both' ) %]
                                 <span class="shelvingloc">[% ITEM_RESULT.location_description %]</span>
                             [% END %]
 
@@ -1275,6 +1277,11 @@
                     [% IF ( itemdata_ccode ) %]
                         <td class="collection">[% ITEM_RESULT.ccode %]</td>
                     [% END %]
+
+                    [% IF ( Koha.Preference('OpacLocationOnDetail') == 'column' && itemdata_location ) %]
+                        <td class="shelving_location">[% ITEM_RESULT.location_description %]</td>
+                    [% END %]
+
                     <td class="call_no" property="sku">
                         [% IF ( ITEM_RESULT.itemcallnumber ) %]
                             [% ITEM_RESULT.itemcallnumber %]
diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index b31a00fe03..4a7e79a5e6 100755
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -687,7 +687,7 @@ if ( not $viewallitems and @items > $max_items_to_display ) {
         $itm->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{ $itm->{itype} }->{'imageurl'} );
         $itm->{'description'} = $itemtypes->{ $itm->{itype} }->{translated_description};
     }
-    foreach (qw(ccode enumchron copynumber itemnotes uri)) {
+    foreach (qw(ccode enumchron copynumber itemnotes location_description uri)) {
         $itemfields{$_} = 1 if ($itm->{$_});
     }
 
@@ -759,7 +759,8 @@ my $subtitle         = GetRecordValue('subtitle', $record, GetFrameworkCode($bib
                      itemdata_enumchron      => $itemfields{enumchron},
                      itemdata_uri            => $itemfields{uri},
                      itemdata_copynumber     => $itemfields{copynumber},
-                     itemdata_itemnotes          => $itemfields{itemnotes},
+                     itemdata_itemnotes      => $itemfields{itemnotes},
+                     itemdata_location       => $itemfields{location_description},
                      subtitle                => $subtitle,
                      OpacStarRatings         => C4::Context->preference("OpacStarRatings"),
     );
@@ -1190,8 +1191,7 @@ if ( C4::Context->preference('UseCourseReserves') ) {
 }
 
 $template->param(
-    'OpacLocationBranchToDisplay'         => C4::Context->preference('OpacLocationBranchToDisplay') ,
-    'OpacLocationBranchToDisplayShelving' => C4::Context->preference('OpacLocationBranchToDisplayShelving'),
+    'OpacLocationBranchToDisplay' => C4::Context->preference('OpacLocationBranchToDisplay'),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;