diff --git a/src/c3nav/editor/templates/editor/changeset.html b/src/c3nav/editor/templates/editor/changeset.html
index 03a89ec0..9443f4fe 100644
--- a/src/c3nav/editor/templates/editor/changeset.html
+++ b/src/c3nav/editor/templates/editor/changeset.html
@@ -86,7 +86,7 @@
         <thead>
             <tr>
                 <th colspan="2">
-                    {% if obj.edit_url and active %}
+                    {% if obj.edit_url %}
                         <a class="btn btn-default btn-xs pull-right" data-force-next-zoom href="{{ obj.edit_url }}">
                             {% trans 'Edit' %}
                         </a>
diff --git a/src/c3nav/editor/views/changes.py b/src/c3nav/editor/views/changes.py
index 8c162eda..88e2aaee 100644
--- a/src/c3nav/editor/views/changes.py
+++ b/src/c3nav/editor/views/changes.py
@@ -223,7 +223,7 @@ def changeset_detail(request, pk):
         prev_values = changeset.changes.prev.get(changed_object.obj).values
 
         edit_url = None
-        if not changed_object.deleted:
+        if not changed_object.deleted and (active or changeset.state == "applied"):
             # todo: only if it's active
             reverse_kwargs = {'pk': changed_object.obj.id}
             if "space" in prev_values: