diff --git a/bookwyrm/templates/components/inline_form.html b/bookwyrm/templates/components/inline_form.html
index a8924ef2..37f9f556 100644
--- a/bookwyrm/templates/components/inline_form.html
+++ b/bookwyrm/templates/components/inline_form.html
@@ -1,5 +1,5 @@
 {% load i18n %}
-<section class="card is-hidden {{ class }}" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
+<section class="card {% if not visible %}is-hidden {% endif %}{{ class }}" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}">
     <header class="card-header has-background-white-ter">
         <h2 class="card-header-title" tabindex="0" id="{{ controls_text }}{% if controls_uid %}-{{ controls_uid }}{% endif %}_header">
             {% block header %}{% endblock %}
diff --git a/bookwyrm/templates/feed/feed.html b/bookwyrm/templates/feed/feed.html
index b8e351c9..a6175199 100644
--- a/bookwyrm/templates/feed/feed.html
+++ b/bookwyrm/templates/feed/feed.html
@@ -25,7 +25,7 @@
 {% if request.user.show_goal and not goal and tab.key == 'home' %}
 {% now 'Y' as year %}
 <section class="block">
-    {% include 'snippets/goal_card.html' with year=year %}
+    {% include 'feed/goal_card.html' with year=year %}
     <hr>
 </section>
 {% endif %}
diff --git a/bookwyrm/templates/snippets/goal_card.html b/bookwyrm/templates/feed/goal_card.html
similarity index 77%
rename from bookwyrm/templates/snippets/goal_card.html
rename to bookwyrm/templates/feed/goal_card.html
index 329fea54..40ba614e 100644
--- a/bookwyrm/templates/snippets/goal_card.html
+++ b/bookwyrm/templates/feed/goal_card.html
@@ -7,13 +7,8 @@
 </h3>
 {% endblock %}
 
-
 {% block card-content %}
-<div class="content">
-    <p>{% blocktrans %}Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.{% endblocktrans %}</p>
-
-    {% include 'snippets/goal_form.html' %}
-</div>
+{% include 'snippets/goal_form.html' %}
 {% endblock %}
 
 {% block card-footer %}
diff --git a/bookwyrm/templates/snippets/goal_form.html b/bookwyrm/templates/snippets/goal_form.html
index 3afcf2ac..f05d8b8b 100644
--- a/bookwyrm/templates/snippets/goal_form.html
+++ b/bookwyrm/templates/snippets/goal_form.html
@@ -1,36 +1,36 @@
 {% load i18n %}
-<form method="post" name="goal" action="{% url 'user-goal' request.user.localname year %}">
-    {% csrf_token %}
-    <input type="hidden" name="year" value="{% if goal %}{{ goal.year }}{% else %}{{ year }}{% endif %}">
-    <input type="hidden" name="user" value="{{ request.user.id }}">
+<div class="content">
+    <p>{% blocktrans %}Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.{% endblocktrans %}</p>
 
-    <div class="columns">
-        <div class="column">
-            <label class="label" for="id_goal">{% trans "Reading goal:" %}</label>
-            <div class="field has-addons">
-                <div class="control">
-                    <input type="number" class="input" name="goal" min="1" id="id_goal" value="{% if goal %}{{ goal.goal }}{% else %}12{% endif %}">
+    <form method="post" name="goal" action="{% url 'user-goal' request.user.localname year %}">
+        {% csrf_token %}
+        <input type="hidden" name="year" value="{% if goal %}{{ goal.year }}{% else %}{{ year }}{% endif %}">
+        <input type="hidden" name="user" value="{{ request.user.id }}">
+
+        <div class="columns">
+            <div class="column">
+                <label class="label" for="id_goal">{% trans "Reading goal:" %}</label>
+                <div class="field has-addons">
+                    <div class="control">
+                        <input type="number" class="input" name="goal" min="1" id="id_goal" value="{% if goal %}{{ goal.goal }}{% else %}12{% endif %}">
+                    </div>
+                    <p class="button is-static" aria-hidden="true">{% trans "books" %}</p>
                 </div>
-                <p class="button is-static" aria-hidden="true">{% trans "books" %}</p>
+            </div>
+
+            <div class="column">
+                <label class="label" for="privacy_{{ goal.id }}">{% trans "Goal privacy:" %}</label>
+                {% include 'snippets/privacy_select.html' with no_label=True current=goal.privacy uuid=goal.id %}
             </div>
         </div>
 
-        <div class="column">
-            <label class="label"><p class="mb-2">{% trans "Goal privacy:" %}</p>
-                {% include 'snippets/privacy_select.html' with no_label=True current=goal.privacy %}
-            </label>
-        </div>
-    </div>
-    <label for="post_status" class="label">
-        <input type="checkbox" name="post-status" id="post_status" class="checkbox" checked>
-        {% trans "Post to feed" %}
-    </label>
+        <label for="post_status" class="label">
+            <input type="checkbox" name="post-status" id="post_status" class="checkbox" checked>
+            {% trans "Post to feed" %}
+        </label>
 
-    <p>
-        <button type="submit" class="button is-link">{% trans "Set goal" %}</button>
-        {% if goal %}
-        {% trans "Cancel" as button_text %}
-        {% include 'snippets/toggle/close_button.html' with text=button_text controls_text="show_edit_goal" %}
-        {% endif %}
-    </p>
-</form>
+        <div class="field">
+            <button type="submit" class="button is-link">{% trans "Set goal" %}</button>
+        </div>
+    </form>
+</div>
diff --git a/bookwyrm/templates/user/goal.html b/bookwyrm/templates/user/goal.html
index 8c014cb3..f3547243 100644
--- a/bookwyrm/templates/user/goal.html
+++ b/bookwyrm/templates/user/goal.html
@@ -1,5 +1,6 @@
 {% extends 'user/layout.html' %}
 {% load i18n %}
+{% load utilities %}
 
 {% block header %}
 <div class="columns is-mobile">
@@ -19,20 +20,8 @@
 <section class="block">
     {% now 'Y' as current_year %}
     {% if user == request.user and year|add:0 == current_year|add:0 %}
-    <div class="block">
-        <section class="card {% if goal %}is-hidden{% endif %}" id="show_edit_goal">
-            <header class="card-header">
-                <h2 class="card-header-title has-background-primary has-text-white" tabindex="0" id="edit_form_header">
-                    <span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span> {% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
-                </h2>
-            </header>
-            <section class="card-content content">
-                <p>{% blocktrans %}Set a goal for how many books you'll finish reading in {{ year }}, and track your progress throughout the year.{% endblocktrans %}</p>
-
-                {% include 'snippets/goal_form.html' with goal=goal year=year %}
-            </section>
-        </section>
-    </div>
+    {% comparison_bool goal None as visible %}
+    {% include 'user/goal_form.html' with goal=goal year=year visible=visible controls_text="show_edit_goal" class="block" %}
     {% endif %}
 
     {% if not goal and user != request.user %}
diff --git a/bookwyrm/templates/user/goal_form.html b/bookwyrm/templates/user/goal_form.html
new file mode 100644
index 00000000..14fb4763
--- /dev/null
+++ b/bookwyrm/templates/user/goal_form.html
@@ -0,0 +1,12 @@
+{% extends 'components/inline_form.html' %}
+{% load i18n %}
+
+{% block header %}
+<span class="icon icon-book is-size-3 mr-2" aria-hidden="true"></span>
+{% blocktrans %}{{ year }} Reading Goal{% endblocktrans %}
+{% endblock %}
+
+{% block form %}
+{% include "snippets/goal_form.html" %}
+{% endblock %}
+
diff --git a/bookwyrm/tests/views/test_goal.py b/bookwyrm/tests/views/test_goal.py
index cb8c5d8e..741fca9c 100644
--- a/bookwyrm/tests/views/test_goal.py
+++ b/bookwyrm/tests/views/test_goal.py
@@ -1,12 +1,13 @@
 """ test for app action functionality """
 from unittest.mock import patch
-from django.utils import timezone
+from tidylib import tidy_document
 
 from django.contrib.auth.models import AnonymousUser
 from django.http import Http404
 from django.template.response import TemplateResponse
 from django.test import TestCase
 from django.test.client import RequestFactory
+from django.utils import timezone
 
 from bookwyrm import models, views
 
@@ -61,7 +62,16 @@ class GoalViews(TestCase):
         request.user = self.local_user
 
         result = view(request, self.local_user.localname, self.year)
-        result.render()
+        html = result.render()
+        _, errors = tidy_document(
+            html.content,
+            options={
+                "drop-empty-elements": False,
+                "warn-proprietary-attributes": False,
+            },
+        )
+        if errors:
+            raise Exception(errors)
         self.assertIsInstance(result, TemplateResponse)
 
     def test_goal_page_anonymous(self):
@@ -92,7 +102,16 @@ class GoalViews(TestCase):
         request.user = self.rat
 
         result = view(request, self.local_user.localname, timezone.now().year)
-        result.render()
+        html = result.render()
+        _, errors = tidy_document(
+            html.content,
+            options={
+                "drop-empty-elements": False,
+                "warn-proprietary-attributes": False,
+            },
+        )
+        if errors:
+            raise Exception(errors)
         self.assertIsInstance(result, TemplateResponse)
 
     def test_goal_page_private(self):