diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
index 3635a7aa2b..bb5b9c19a0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/addbybiblionumber.tt
@@ -17,26 +17,27 @@
 <div id="custom-doc" class="yui-t7">
    <div id="bd">
                 [% IF ( multiple ) %]
-		    <h1>Add [% total %] items to [% IF ( singleshelf ) %]<em>[% shelfname | html%]</em>: [% ELSE %]a list:[% END %]</h1>
+            <h1>Add [% total %] items to [% IF ( singleshelf ) %]<em>[% shelfname | html%]</em>: [% ELSE %]a list:[% END %]</h1>
                 [% ELSE %]
                         <h1>Add to [% IF ( singleshelf ) %]<em>[% shelfname | html %]</em>[% ELSE %]a list:[% END %]</h1>
                 [% END %]
-		<ul>
-		    [% FOREACH biblio IN biblios %]
-			<li> <span class="title">[% biblio.title |html %]</span>
-			    [% IF ( biblio.author ) %]<span class="author"> [% biblio.author %] </span>[% END %]
-			</li>
-		    [% END %]
+        <ul>
+            [% FOREACH biblio IN biblios %]
+            <li> <span class="title">[% biblio.title |html %]</span>
+                [% IF ( biblio.author ) %]<span class="author"> [% biblio.author %] </span>[% END %]
+            </li>
+            [% END %]
                 </ul>
 
-		<form name="f1" action="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl" method="post">
+        <form name="f1" action="/cgi-bin/koha/virtualshelves/addbybiblionumber.pl" method="post">
                         [% FOREACH biblio IN biblios %] <input type="hidden" name="biblionumber" value="[% biblio.biblionumber %]" />[% END %]
-			<input type="hidden" name="confirmed" value="1" />
-			[% IF ( shelfnumber ) %]<input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />[% END %]
+            <input type="hidden" name="confirmed" value="1" />
+            [% IF ( shelfnumber ) %]<input type="hidden" name="shelfnumber" value="[% shelfnumber %]" />[% END %]
 
 [% UNLESS ( shelfnumber ) %]
 
 [% UNLESS ( newshelf ) %]
+    [% IF ( private_shelves.count ) %]
      <fieldset class="rows">
     <legend>Select an existing list</legend>
     <ol>
@@ -67,38 +68,39 @@
             </select>
         </li>
     </ol>
-	[% FOREACH biblio IN biblios %]<input type="hidden" name="biblionumber" value="[% biblio.biblionumber %]" />[% END %]
-	[% UNLESS ( biblionumbers ) %]
-	  <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
-	[% ELSE %]
-	  <input type="hidden" name="biblionumbers" value="[% biblionumbers %]" />
-	[% END %]
-	</fieldset>
+    [% FOREACH biblio IN biblios %]<input type="hidden" name="biblionumber" value="[% biblio.biblionumber %]" />[% END %]
+    [% UNLESS ( biblionumbers ) %]
+      <input type="hidden" name="biblionumber" value="[% biblionumber %]" />
+    [% ELSE %]
+      <input type="hidden" name="biblionumbers" value="[% biblionumbers %]" />
+    [% END %]
+    </fieldset>
 
-	<p>... or...</p>
+    <p>... or...</p>
+[% END %]
 [% END %]
 
     <fieldset class="rows"><legend>Add to a new list:</legend>
-	<ol><li>
-	    <label for="newvirtualshelf">
-		List name:
-	    </label>
-	    [% FOREACH biblio IN biblios %]<input type="hidden" name="biblionumber" value="[% biblio.biblionumber %]" />[% END %]
-	    [% UNLESS ( biblionumbers ) %]
-			  <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber %]" />
-	    [% ELSE %]
-			  <input type="hidden" name="biblionumbers" id="biblionumbers" value="[% biblionumbers %]" />
-	    [% END %]
-	    <input type="text" name="newvirtualshelf" id="newvirtualshelf" size="40" />
-	    <input type="hidden" name="confirmed" value="1" />
-	</li>
-	<li>
-	    <label for="category">Category:</label>
-	    <select name="category" id="category">
-		<option value="1">Private</option>
-		<option value="2">Public</option>
-	    </select>
-	</li></ol>
+    <ol><li>
+        <label for="newvirtualshelf">
+        List name:
+        </label>
+        [% FOREACH biblio IN biblios %]<input type="hidden" name="biblionumber" value="[% biblio.biblionumber %]" />[% END %]
+        [% UNLESS ( biblionumbers ) %]
+              <input type="hidden" name="biblionumber" id="biblionumber" value="[% biblionumber %]" />
+        [% ELSE %]
+              <input type="hidden" name="biblionumbers" id="biblionumbers" value="[% biblionumbers %]" />
+        [% END %]
+        <input type="text" name="newvirtualshelf" id="newvirtualshelf" size="40" />
+        <input type="hidden" name="confirmed" value="1" />
+    </li>
+    <li>
+        <label for="category">Category:</label>
+        <select name="category" id="category">
+        <option value="1">Private</option>
+        <option value="2">Public</option>
+        </select>
+    </li></ol>
     </fieldset>
 
 
@@ -106,11 +108,11 @@
 
 
 <!-- SAVE -->
-		    <fieldset class="action">
+            <fieldset class="action">
             <input type="hidden" name="sortfield" value="title" />
-			<input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a>
-		    </fieldset>
-		</form>
+            <input type="submit" value="Save" class="submit" /> <a class="close cancel" href="#">Cancel</a>
+            </fieldset>
+        </form>
 <!-- /SAVE -->
 
 </div>
diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
index 164c750fd0..aaa34e1b81 100644
--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-addbybiblionumber.tt
@@ -23,7 +23,7 @@
                                         </li>
                                     [% END %]
                                 </ul>
-                                [% IF private_shelves.count or public_shelves.count or private_shelves_shared_with_me %]
+                                [% IF private_shelves.count or public_shelves.count or private_shelves_shared_with_me.count %]
                                     <form name="f1" action="/cgi-bin/koha/opac-addbybiblionumber.pl" method="post">
                                         <fieldset>
                                             <legend>Select a list</legend>