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 de5cee5fb7..39159ccb75 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-shelves.tt
@@ -543,7 +543,7 @@
                                             [% END %]
                                         </select>
                                     </li>
-                                    [% IF (OpacAllowPublicListCreation) %]
+                                    [% IF ( OpacAllowPublicListCreation || category2 ) %]
                                         <li>
                                             <label for="category">Category:</label>
                                             <select name="category" id="category">
@@ -558,16 +558,15 @@
                                                     <option value="2">Public</option>
                                                 [% END %]
                                             </select>
+                                            [% IF ( category2 && !OpacAllowPublicListCreation ) %]
+                                                The library has disabled the ability for patrons to create new public lists.  If you make your list private, you will not be able to make it public again.
+                                            [% END %]
                                         </li>
                                         [% INCLUDE list_permissions %]
                                     [% END %]
                                 </ol>
-                                [% UNLESS ( OpacAllowPublicListCreation ) %]
-                                    [% IF ( category2 ) %]
-                                        <input type="hidden" name="category" value="2" />
-                                    [% ELSE %]
-                                        <input type="hidden" name="category" value="1" />
-                                    [% END %]
+                                [% UNLESS ( OpacAllowPublicListCreation || category2 ) %]
+                                    <input type="hidden" name="category" value="1" />
                                 [% END %]
                             </fieldset>
 
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
index a961d5d633..b157994047 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tt
@@ -564,23 +564,22 @@ $(document).ready(function() {
                           [% IF ( sortfield == "itemcallnumber" ) %]<option value="itemcallnumber" selected="selected">Call number</option>[% ELSE %]<option value="itemcallnumber">Call number</option>[% END %]
                         </select>
                       </li>
-                      [% IF (OpacAllowPublicListCreation) %]
+                      [% IF ( OpacAllowPublicListCreation || category2 ) %]
                       <li>
                         <label for="category">Category:</label>
                         <select name="category" id="category">
                           [% IF ( category1 ) %]<option value="1" selected="selected">Private</option>[% ELSE %]<option value="1">Private</option>[% END %]
                           [% IF ( category2 ) %]<option value="2" selected="selected">Public</option>[% ELSE %]<option value="2">Public</option>[% END %]
                         </select>
+                          [% IF ( category2 && !OpacAllowPublicListCreation ) %]
+                              The library has disabled the ability for patrons to create new public lists.  If you make your list private, you will not be able to make it public again.
+                          [% END %]
                       </li>
                       [% INCLUDE list_permissions %]
                       [% END %]
                     </ol>
-                    [% UNLESS ( OpacAllowPublicListCreation ) %]
-                        [% IF ( category2 ) %]
-                            <input type="hidden" name="category" value="2" />
-                        [% ELSE %]
-                            <input type="hidden" name="category" value="1" />
-                        [% END %]
+                    [% UNLESS ( OpacAllowPublicListCreation || category2 ) %]
+                        <input type="hidden" name="category" value="1" />
                     [% END %]
                   </fieldset>
                   <fieldset class="action"><input type="submit" value="Save" class="submit" /> [% IF ( showprivateshelves ) %]<a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=[% shelfnumber %]&amp;display=privateshelves">Cancel</a>[% ELSE %]<a class="cancel" href="/cgi-bin/koha/opac-shelves.pl?shelfnumber=[% shelfnumber %]">Cancel</a>[% END %]</fieldset>