diff --git a/bookwyrm/templates/book/edit/edit_book_form.html b/bookwyrm/templates/book/edit/edit_book_form.html
index 38a7fe35d..d886d12f7 100644
--- a/bookwyrm/templates/book/edit/edit_book_form.html
+++ b/bookwyrm/templates/book/edit/edit_book_form.html
@@ -22,7 +22,7 @@
                         {% trans "Title:" %}
                     </label>
                     <input type="text" name="title" value="{{ form.title.value|default:'' }}" maxlength="255" class="input" required="" id="id_title" aria-describedby="desc_title">
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.title.errors id="desc_title" %}
                 </div>
 
@@ -31,7 +31,7 @@
                         {% trans "Subtitle:" %}
                     </label>
                     <input type="text" name="subtitle" value="{{ form.subtitle.value|default:'' }}" maxlength="255" class="input" id="id_subtitle" aria-describedby="desc_subtitle">
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.subtitle.errors id="desc_subtitle" %}
                 </div>
 
@@ -40,7 +40,7 @@
                         {% trans "Description:" %}
                     </label>
                     {{ form.description }}
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.description.errors id="desc_description" %}
                 </div>
 
@@ -51,7 +51,7 @@
                                 {% trans "Series:" %}
                             </label>
                             <input type="text" class="input" name="series" id="id_series" value="{{ form.series.value|default:'' }}" aria-describedby="desc_series">
-                            
+
                             {% include 'snippets/form_errors.html' with errors_list=form.series.errors id="desc_series" %}
                         </div>
                     </div>
@@ -61,7 +61,7 @@
                                 {% trans "Series number:" %}
                             </label>
                             {{ form.series_number }}
-                            
+
                             {% include 'snippets/form_errors.html' with errors_list=form.series_number.errors id="desc_series_number" %}
                         </div>
                     </div>
@@ -75,21 +75,41 @@
                     <span class="help" id="desc_languages_help">
                         {% trans "Separate multiple values with commas." %}
                     </span>
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.languages.errors id="desc_languages" %}
                 </div>
 
-                <div class="field">
-                    <label class="label" for="id_subjects">
+                <div>
+                    <label class="label" for="id_add_subjects">
                         {% trans "Subjects:" %}
                     </label>
-                    {{ form.subjects }}
-                    <span class="help" id="desc_subjects_help">
-                        {% trans "Separate multiple values with commas." %}
-                    </span>
+                    {% for subject in book.subjects %}
+                    <label class="label is-sr-only" for="id_add_subject={% if not forloop.first %}-{{forloop.counter}}{% endif %}">
+                        {% trans "Add subject" %}
+                    </label>
+                    <div class="field has-addons">
+                        <div class="control is-expanded">
+                            <input id="id_add_subject-{{ forloop.counter }}" type="text" name="subject-" value="{{ subject }}" class="input">
+                        </div>
+                        <div class="control">
+                            <button class="button is-danger is-light" type="button">
+                                <span class="icon icon-x" title="{% trans 'Remove' %}">
+                                    <span class="is-sr-only">{% trans "Remove" %}</span>
+                                </span>
+                            </button>
+                        </div>
+                    </div>
+                    {% endfor %}
+                    <input class="input" type="text" name="add_subject" id="id_add_subject" value="{{ subject }}" {% if confirm_mode %}readonly{% endif %}>
 
                     {% include 'snippets/form_errors.html' with errors_list=form.subjects.errors id="desc_subjects" %}
                 </div>
+
+                <span class="help">
+                    <button class="button is-small" type="button" data-duplicate="id_add_subject" id="another_subject_field">
+                        {% trans "Add Another Subject" %}
+                    </button>
+                </span>
             </div>
         </section>
 
@@ -106,7 +126,7 @@
                     <span class="help" id="desc_publishers_help">
                         {% trans "Separate multiple values with commas." %}
                     </span>
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.publishers.errors id="desc_publishers" %}
                 </div>
 
@@ -115,7 +135,7 @@
                         {% trans "First published date:" %}
                     </label>
                     <input type="date" name="first_published_date" class="input" id="id_first_published_date"{% if form.first_published_date.value %} value="{{ form.first_published_date.value|date:'Y-m-d' }}"{% endif %} aria-describedby="desc_first_published_date">
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.first_published_date.errors id="desc_first_published_date" %}
                 </div>
 
@@ -124,7 +144,7 @@
                         {% trans "Published date:" %}
                     </label>
                     <input type="date" name="published_date" class="input" id="id_published_date"{% if form.published_date.value %} value="{{ form.published_date.value|date:'Y-m-d'}}"{% endif %} aria-describedby="desc_published_date">
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.published_date.errors id="desc_published_date" %}
                 </div>
             </div>
@@ -193,7 +213,7 @@
                             </label>
                             <input class="input" name="cover-url" id="id_cover_url" type="url" value="{{ cover_url|default:'' }}" aria-describedby="desc_cover">
                         </div>
-                        
+
                         {% include 'snippets/form_errors.html' with errors_list=form.cover.errors id="desc_cover" %}
                     </div>
                 </div>
@@ -214,7 +234,7 @@
                             <div class="select">
                                 {{ form.physical_format }}
                             </div>
-                            
+
                             {% include 'snippets/form_errors.html' with errors_list=form.physical_format.errors id="desc_physical_format" %}
                         </div>
                     </div>
@@ -224,7 +244,7 @@
                                 {% trans "Format details:" %}
                             </label>
                             {{ form.physical_format_detail }}
-                            
+
                             {% include 'snippets/form_errors.html' with errors_list=form.physical_format_detail.errors id="desc_physical_format_detail" %}
                         </div>
                     </div>
@@ -235,7 +255,7 @@
                         {% trans "Pages:" %}
                     </label>
                     {{ form.pages }}
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.pages.errors id="desc_pages" %}
                 </div>
             </div>
@@ -251,7 +271,7 @@
                         {% trans "ISBN 13:" %}
                     </label>
                     {{ form.isbn_13 }}
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.isbn_13.errors id="desc_isbn_13" %}
                 </div>
 
@@ -260,7 +280,7 @@
                         {% trans "ISBN 10:" %}
                     </label>
                     {{ form.isbn_10 }}
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.isbn_10.errors id="desc_isbn_10" %}
                 </div>
 
@@ -269,7 +289,7 @@
                         {% trans "Openlibrary ID:" %}
                     </label>
                     {{ form.openlibrary_key }}
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.openlibrary_key.errors id="desc_openlibrary_key" %}
                 </div>
 
@@ -278,7 +298,7 @@
                         {% trans "Inventaire ID:" %}
                     </label>
                     {{ form.inventaire_id }}
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.inventaire_id.errors id="desc_inventaire_id" %}
                 </div>
 
@@ -287,7 +307,7 @@
                         {% trans "OCLC Number:" %}
                     </label>
                     {{ form.oclc_number }}
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.oclc_number.errors id="desc_oclc_number" %}
                 </div>
 
@@ -296,7 +316,7 @@
                         {% trans "ASIN:" %}
                     </label>
                     {{ form.asin }}
-                    
+
                     {% include 'snippets/form_errors.html' with errors_list=form.ASIN.errors id="desc_ASIN" %}
                 </div>
             </div>