diff --git a/bookwyrm/templates/shelf.html b/bookwyrm/templates/shelf.html
index 30554a5f..da599c7d 100644
--- a/bookwyrm/templates/shelf.html
+++ b/bookwyrm/templates/shelf.html
@@ -75,7 +75,7 @@
 
 <div class="hidden box mb-5" id="edit-shelf-form">
     <h2 class="title is-4">Edit shelf</h2>
-    <form name="create-shelf" action="/edit-shelf/{{ shelf.id }}" method="post">
+    <form name="create-shelf" action="{{ shelf.local_path }}" method="post">
         {% csrf_token %}
         <input type="hidden" name="user" value="{{ request.user.id }}">
         {% if shelf.editable %}
diff --git a/bookwyrm/views/shelf.py b/bookwyrm/views/shelf.py
index ce836955..15b2bd28 100644
--- a/bookwyrm/views/shelf.py
+++ b/bookwyrm/views/shelf.py
@@ -65,12 +65,13 @@ class Shelf(View):
         return TemplateResponse(request, 'shelf.html', data)
 
     @method_decorator(login_required, name='dispatch')
-    def post(self, request, username, shelf_id):
-        ''' user generated shelves '''
-        if not request.user.username == username:
-            return HttpResponseBadRequest()
+    def post(self, request, username, shelf_identifier):
+        ''' edit a shelf '''
+        try:
+            shelf = request.user.shelf_set.get(identifier=shelf_identifier)
+        except models.Shelf.DoesNotExist:
+            return HttpResponseNotFound()
 
-        shelf = get_object_or_404(models.Shelf, id=shelf_id)
         if request.user != shelf.user:
             return HttpResponseBadRequest()
         if not shelf.editable and request.POST.get('name') != shelf.name: