diff --git a/remarkbox/__init__.py b/remarkbox/__init__.py
index fc5b22f..bf7b1d2 100644
--- a/remarkbox/__init__.py
+++ b/remarkbox/__init__.py
@@ -191,6 +191,7 @@ def main(global_config, **settings):
         # are dumb. If we fix our forms to only pass node_id/node_path when not
         # None, the priority / order will not matter.
         if thread_uri:
+            request.session["back_to_thread"] = request.url
             node = get_or_create_node_by_uri(request.dbsession, thread_uri, thread_title)
         elif node_id:
             node = get_node_by_id(request.dbsession, node_id)
diff --git a/remarkbox/templates/user-settings.j2 b/remarkbox/templates/user-settings.j2
index e37930d..d3d3382 100644
--- a/remarkbox/templates/user-settings.j2
+++ b/remarkbox/templates/user-settings.j2
@@ -11,8 +11,14 @@
 {% endif %}
 
 
+{% if request.mode == "embed" %}
+<a href="{{ request.session["back_to_thread"] }}" class="button-right">< back to thread</a>
+{% endif %}
+
 <a href="{{ request.link_prefix }}/log-out" class="button button-right button-small">log out</a>
 
+
+
 <h4>User Settings</h4>
 
 <form method="post" action="{{ request.link_prefix }}/u/settings" onsubmit="submit.disabled = true; return true;">