diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
index 7e0db8e7b2..4873e32852 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
@@ -200,7 +200,8 @@ $.tablesorter.addParser({
         <div id="privateshelves" class="tab-container" style="display:none;">
         <!-- /TMPL_IF -->
         
-        <!-- TMPL_IF NAME="loggedinusername" -->
+		<!-- TMPL_IF NAME="loggedinusername" -->
+    <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a>
             <!-- TMPL_IF NAME="shelveslooppriv" -->
             <!-- TMPL_VAR name='pagination_bar'-->
                 <table>
@@ -240,11 +241,10 @@ $.tablesorter.addParser({
             <tr><td colspan="4">No Private Lists.</td></tr>
             <!-- /TMPL_IF --><!-- /shelveslooppriv -->
         </table>
-        <a class="newshelf" href="/cgi-bin/koha/opac-shelves.pl?shelves=1">New List</a>
+		</div><!-- /privateshelves -->
         <!-- TMPL_ELSE --><!-- /loggedinusername -->
-            <div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>
+          <div><a href="/cgi-bin/koha/opac-user.pl">Log in</a> to create new Lists.</div>
         <!-- /TMPL_IF --><!-- /loggedinusername -->
-        </div><!-- /privateshelves -->
 
         <!-- TMPL_IF NAME="showpublicshelves" -->
         <div id="publicshelves" class="tab-container" style="display:block;">
@@ -254,16 +254,35 @@ $.tablesorter.addParser({
         <!-- TMPL_IF NAME="shelvesloop" -->
         <!-- TMPL_VAR name='pagination_bar'-->
         <table>
-        <tr><th>List Name</th><th>Contents</th><th>Type</th></tr>
+        <tr><th>List Name</th><th>Contents</th><th>Type</th><th>&nbsp;</th></tr>
             <!-- TMPL_LOOP NAME="shelvesloop" -->
                 <!-- TMPL_IF NAME="toggle" --><tr class="highlight"><!--TMPL_ELSE--><tr><!-- /TMPL_IF -->
         <td><a href="opac-shelves.pl?viewshelf=<!-- TMPL_VAR NAME="shelf" -->"><!-- TMPL_VAR NAME="shelfname" ESCAPE="html"  --></a></td>
         <td><!-- TMPL_VAR NAME="count" --> item(s)</td>
         <td><!-- TMPL_IF NAME="viewcategory1" -->Private<!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="viewcategory2" -->Public<!-- /TMPL_IF -->
-            <!-- TMPL_IF NAME="viewcategory3" -->Open<!-- /TMPL_IF -->
-        </td>
-        </tr>
+	    <!-- TMPL_IF NAME="viewcategory2" -->Public<!-- /TMPL_IF -->
+	    <!-- TMPL_IF NAME="viewcategory3" -->Open<!-- /TMPL_IF -->
+	</td>
+    <td>
+            <!-- TMPL_IF NAME="mine" -->
+        <form action="opac-shelves.pl" method="get">
+          <input type="hidden" name="shelfnumber" value="<!-- TMPL_VAR NAME="shelf" -->" />
+          <input type="hidden" name="op" value="modif" />
+          <input type="submit" class="editshelf" value="Edit" />
+        </form>
+        <form action="opac-shelves.pl" method="post">
+          <input type="hidden" name="shelves" value="1" />
+          <input type="hidden" name="DEL-<!-- TMPL_VAR NAME="shelf" -->" value="1" />
+          <!-- TMPL_IF NAME="confirm" -->
+          <input type="hidden" name="CONFIRM-<!-- TMPL_VAR NAME="confirm" -->" value="1" />
+          <input type="submit" class="confirm" value="Confirm" />
+          <!-- TMPL_ELSE -->
+          <input type="submit" class="deleteshelf" onclick="return confirmDelete(_('Are you sure you want to remove this List?'));" value="Delete" />
+          <!-- /TMPL_IF -->
+        </form>
+      <!-- /TMPL_IF -->&nbsp;
+    </td>
+		</tr>
             <!-- /TMPL_LOOP -->
         </table>
         <!-- TMPL_ELSE -->