diff --git a/bookwyrm/templates/shelf/edit_shelf_form.html b/bookwyrm/templates/shelf/edit_shelf_form.html
index 753d0681..847d5e46 100644
--- a/bookwyrm/templates/shelf/edit_shelf_form.html
+++ b/bookwyrm/templates/shelf/edit_shelf_form.html
@@ -9,23 +9,22 @@
 <form name="edit-shelf" action="{{ shelf.local_path }}" 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">{% trans "Name:" %}</label>
-        <input type="text" name="name" maxlength="100" class="input" required="true" value="{{ shelf.name }}" id="id_name">
-    </div>
-    {% else %}
-    <input type="hidden" name="name" required="true" value="{{ shelf.name }}">
-    {% endif %}
+    <div class="columns is-mobile">
+        {% if shelf.editable %}
+        <div class="column">
+            <label class="label" for="id_name">{% trans "Name:" %}</label>
+            <input type="text" name="name" maxlength="100" class="input" required="true" value="{{ shelf.name }}" id="id_name">
+        </div>
+        {% else %}
+        <input type="hidden" name="name" required="true" value="{{ shelf.name }}">
+        {% endif %}
 
-    <div class="field has-addons">
-        <div class="control">
-            {% include 'snippets/privacy_select.html' with current=shelf.privacy %}
-        </div>
-        <div class="control">
-            <button class="button is-primary" type="submit">{% trans "Update shelf" %}</button>
+        <div class="column">
+            <label class="label" for="privacy_{{ shelf.id }}">{% trans "Shelf privacy:" %}</label>
+            {% include 'snippets/privacy_select.html' with current=shelf.privacy uuid=shelf.id no_label=True %}
         </div>
     </div>
+    <button class="button is-primary" type="submit">{% trans "Update shelf" %}</button>
 </form>
 {% endblock %}
 
diff --git a/bookwyrm/templates/snippets/privacy_select.html b/bookwyrm/templates/snippets/privacy_select.html
index d7184e13..e1053051 100644
--- a/bookwyrm/templates/snippets/privacy_select.html
+++ b/bookwyrm/templates/snippets/privacy_select.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 {% load utilities %}
 <div class="select {{ class }}">
-    {% with 0|uuid as uuid %}
+    {% firstof uuid 0|uuid as uuid %}
     {% if not no_label %}
     <label class="is-sr-only" for="privacy_{{ uuid }}">{% trans "Post privacy" %}</label>
     {% endif %}
@@ -20,6 +20,5 @@
             {% trans "Private" %}
         </option>
     </select>
-    {% endwith %}
 </div>