diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
index cfce27b637..eb9f65bf60 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -49,7 +49,7 @@
Your lists
[% END %]
[% ELSIF ( category2 ) %]
- [% IF ( viewshelf ) %]
+ [% IF ( viewshelf || edit ) %]
Public lists
[% ELSE %]
Public lists
@@ -61,7 +61,7 @@
Your lists
[% END %]
[% ELSIF ( showpublicshelves ) %]
- [% IF ( viewshelf || edit ) %]
+ [% IF ( viewshelf || edit || shelves ) %]
Public lists
[% ELSE %]
Public lists
@@ -462,6 +462,30 @@
[% END %]
[% ELSE %]
+
+
This list is empty.
[% IF Koha.Preference( 'opacuserlogin' ) == 1 %]
@@ -486,12 +510,12 @@
[% END %]
[% IF ( edit ) %]
-