diff --git a/fedireads/templates/book.html b/fedireads/templates/book.html
index c3b13050..25776181 100644
--- a/fedireads/templates/book.html
+++ b/fedireads/templates/book.html
@@ -21,6 +21,8 @@
                 </div>
             </div>
 
+            {% include 'snippets/shelve_button.html' %}
+
         </div>
     </div>
 </div>
diff --git a/fedireads/templatetags/fr_display.py b/fedireads/templatetags/fr_display.py
index b34fc9f6..b3c4ad80 100644
--- a/fedireads/templatetags/fr_display.py
+++ b/fedireads/templatetags/fr_display.py
@@ -84,7 +84,7 @@ def shelve_button_identifier(context, book):
     ''' check what shelf a user has a book on, if any '''
     try:
         shelf = models.ShelfBook.objects.get(
-            shelf__user=context['user'],
+            shelf__user=context['request'].user,
             book=book
         )
     except models.ShelfBook.DoesNotExist:
@@ -102,7 +102,7 @@ def shelve_button_text(context, book):
     ''' check what shelf a user has a book on, if any '''
     try:
         shelf = models.ShelfBook.objects.get(
-            shelf__user=context['user'],
+            shelf__user=context['request'].user,
             book=book
         )
     except models.ShelfBook.DoesNotExist: