diff --git a/app/templates/user/edit_note.html b/app/templates/user/edit_note.html
index 5f003e0e..083f3bdc 100644
--- a/app/templates/user/edit_note.html
+++ b/app/templates/user/edit_note.html
@@ -42,6 +42,10 @@
                             <button id="vomit" class="emojitoggle">🤮</button>
                         </div>
                         {{ render_form(form) }}
+                        {% if return_to -%}
+                            <p></p>
+                            <a href="{{ return_to }}" class="go_back">{{ _('Back') }}</a>
+                        {% endif -%}
                         <div class="row mt-5"><small class="field_hint">{{ _('This note appears next to their username. It\'s meant just for you and not displayed to anyone else.') }}</small></div>
                     </div>
                 </div>
diff --git a/app/templates/user/user_preview.html b/app/templates/user/user_preview.html
index cba88076..dd0dae27 100644
--- a/app/templates/user/user_preview.html
+++ b/app/templates/user/user_preview.html
@@ -52,6 +52,11 @@
             <div class="col-auto text-center">
                 <a href="/u/{{ user.link() }}" class="btn btn-primary btn-sm">{{ _('View profile') }}</a>
             </div>
+            {% if current_user.is_authenticated -%}
+                <div class="col-auto text-center">
+                    <a href="{{ url_for('user.edit_user_note', actor=user.link(), return_to=return_to) }}" class="btn btn-secondary btn-sm">{{ _('Edit note') }}</a>
+                </div>
+            {% endif -%}
         </div>
     </div>
 </div>