diff --git a/bookwyrm/templates/shelf.html b/bookwyrm/templates/shelf.html
index f8e0e35b..571578cf 100644
--- a/bookwyrm/templates/shelf.html
+++ b/bookwyrm/templates/shelf.html
@@ -31,18 +31,21 @@
 
     {% if is_self %}
     <div class="column is-narrow">
-        <label for="create-shelf-form">
-            <div role="button" tabindex="0">
-                <span class="icon icon-plus">
-                    <span class="is-sr-only">Create new shelf</span>
-                </span>
-            </div>
-        </a>
+        <input type="radio" id="create-shelf-form-hide" name="create-shelf-form" class="toggle-control" checked>
+        <div class="toggle-content hidden">
+            <label for="create-shelf-form-show">
+                <div role="button" tabindex="0">
+                    <span class="icon icon-plus">
+                        <span class="is-sr-only">Create new shelf</span>
+                    </span>
+                </div>
+            </label>
+        </div>
     </div>
     {% endif %}
 </div>
 
-<input type="checkbox" id="create-shelf-form" class="toggle-control">
+<input type="radio" id="create-shelf-form-show" name="create-shelf-form" class="toggle-control">
 <div class="toggle-content hidden">
     <div class="box mb-5">
         <h2 class="title is-4">Create new shelf</h2>
@@ -51,16 +54,16 @@
             <input type="hidden" name="user" value="{{ request.user.id }}">
             <div class="field">
                 <label class="label" for="id_name">Name:</label>
-                <input type="text" name="name" maxlength="100" class="input" required="" id="id_name">
+                <input type="text" name="name" maxlength="100" class="input" required="true" id="id_name">
             </div>
 
             <label class="label">
                 <p>Shelf privacy:</p>
-                {% include 'snippets/privacy_select.html' with no_label=True%}
+                {% include 'snippets/privacy_select.html' with no_label=True %}
             </label>
             <div class="field is-grouped">
                 <button class="button is-primary" type="submit">Create shelf</button>
-                <label role="button" class="button" for="create-shelf-form" tabindex="0">Cancel<label>
+                <label role="button" class="button" for="create-shelf-form-hide" tabindex="0">Cancel<label>
             </div>
         </form>
     </div>
@@ -77,15 +80,46 @@
     </div>
     {% if is_self %}
     <div class="column is-narrow">
-        <a href="/edit-shelf/{{ shelf.identifier }}">
-            <span class="icon icon-pencil">
-                <span class="is-sr-only">Edit shelf</span>
-            </span>
-        </a>
+        <input type="radio" id="edit-shelf-form-hide" name="edit-shelf-form" class="toggle-control" checked>
+        <div class="toggle-content hidden">
+            <label for="edit-shelf-form-show">
+                <div role="button" tabindex="0">
+                    <span class="icon icon-pencil">
+                        <span class="is-sr-only">Edit shelf</span>
+                    </span>
+                </div>
+            </label>
+        </div>
     </div>
     {% endif %}
 </div>
 
+<input type="radio" id="edit-shelf-form-show" name="edit-shelf-form" class="toggle-control">
+<div class="toggle-content hidden">
+    <div class="box mb-5">
+        <h2 class="title is-4">Edit shelf</h2>
+        <form name="create-shelf" action="/edit-shelf/{{ shelf.id }}" method="post">
+            {% csrf_token %}
+            <input type="hidden" name="user" value="{{ request.user.id }}">
+            {% if shelf.editable %}
+            <div class="field">
+                <label class="label" for="id_name">Name:</label>
+                <input type="text" name="name" maxlength="100" class="input" required="true" value="{{ shelf.name }}" id="id_name">
+            </div>
+            {% endif %}
+
+            <label class="label">
+                <p>Shelf privacy:</p>
+                {% include 'snippets/privacy_select.html' with no_label=True current=shelf.privacy %}
+            </label>
+            <div class="field is-grouped">
+                <button class="button is-primary" type="submit">Update shelf</button>
+                <label role="button" class="button" for="edit-shelf-form-hide" tabindex="0">Cancel<label>
+            </div>
+        </form>
+    </div>
+</div>
+
 <div class="block">
     <div>
         {% include 'snippets/shelf.html' with shelf=shelf ratings=ratings %}
diff --git a/bookwyrm/templates/snippets/privacy_select.html b/bookwyrm/templates/snippets/privacy_select.html
index 83ea9bea..c8d974c0 100644
--- a/bookwyrm/templates/snippets/privacy_select.html
+++ b/bookwyrm/templates/snippets/privacy_select.html
@@ -5,10 +5,18 @@
     <label class="is-sr-only" for="privacy-{{ uuid }}">Post privacy</label>
     {% endif %}
     <select name="privacy" id="privacy-{{ uuid }}">
-        <option value="public" selected>Public</option>
-        <option value="unlisted">Unlisted</option>
-        <option value="followers">Followers only</option>
-        <option value="direct">Private</option>
+        <option value="public" {% if not current or current == 'public' %}selected{% endif %}>
+            Public
+        </option>
+        <option value="unlisted" {% if current == 'unlisted' %}selected{% endif %}>
+            Unlisted
+        </option>
+        <option value="followers" {% if current == 'followers' %}selected{% endif %}>
+            Followers only
+        </option>
+        <option value="direct" {% if current == 'direct' %}selected{% endif %}>
+            Private
+        </option>
     </select>
     {% endwith %}
 </div>
diff --git a/bookwyrm/urls.py b/bookwyrm/urls.py
index 82726c66..d55c6f61 100644
--- a/bookwyrm/urls.py
+++ b/bookwyrm/urls.py
@@ -121,6 +121,7 @@ urlpatterns = [
     re_path(r'^delete-status/?$', actions.delete_status),
 
     re_path(r'^create-shelf/?$', actions.create_shelf),
+    re_path(r'^edit-shelf/(?P<shelf_id>\d+)?$', actions.edit_shelf),
     re_path(r'^shelve/?$', actions.shelve),
     re_path(r'^unshelve/?$', actions.unshelve),
     re_path(r'^start-reading/?$', actions.start_reading),
diff --git a/bookwyrm/view_actions.py b/bookwyrm/view_actions.py
index ee035c5c..518aa271 100644
--- a/bookwyrm/view_actions.py
+++ b/bookwyrm/view_actions.py
@@ -11,7 +11,7 @@ from django.contrib.auth.decorators import login_required, permission_required
 from django.core.exceptions import PermissionDenied
 from django.core.files.base import ContentFile
 from django.http import HttpResponseBadRequest, HttpResponseNotFound
-from django.shortcuts import redirect
+from django.shortcuts import get_object_or_404, redirect
 from django.template.response import TemplateResponse
 from django.utils import timezone
 
@@ -276,6 +276,20 @@ def upload_cover(request, book_id):
 def create_shelf(request):
     ''' user generated shelves '''
     form = forms.ShelfForm(request.POST)
+    if not form.is_valid():
+        return redirect(request.headers.get('Referer', '/'))
+
+    shelf = form.save()
+    return redirect('/user/%s/shelf/%s' % \
+            (request.user.localname, shelf.identifier))
+
+
+@login_required
+def edit_shelf(request, shelf_id):
+    ''' user generated shelves '''
+    shelf = get_object_or_404(models.Shelf, id=shelf_id)
+
+    form = forms.ShelfForm(request.POST, instance=shelf)
     if not form.is_valid():
         return redirect(request.headers.get('Referer', '/'))
     shelf = form.save()