From ed785098a616b1ff7b0fd5d218cd3f9d090fb3db Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Mon, 7 Oct 2019 14:27:02 -0400
Subject: [PATCH] Fixes #3571: Prevent erroneous redirects when editing tags

---
 CHANGELOG.md                     | 1 +
 netbox/templates/extras/tag.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d2351ddf..7b3624c31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@ v2.6.6 (FUTURE)
 
 ## Bug Fixes
 
+* [#3571](https://github.com/netbox-community/netbox/issues/3571) - Prevent erroneous redirects when editing tags
 * [#3573](https://github.com/netbox-community/netbox/issues/3573) - Ensure consistent display of changelog retention period
 * [#3574](https://github.com/netbox-community/netbox/issues/3574) - Change `device` to `parent` in interface editing VLAN filtering logic
 * [#3575](https://github.com/netbox-community/netbox/issues/3575) - Restore label for comments field when bulk editing circuits
diff --git a/netbox/templates/extras/tag.html b/netbox/templates/extras/tag.html
index 3011e2d3b..c38bc2f50 100644
--- a/netbox/templates/extras/tag.html
+++ b/netbox/templates/extras/tag.html
@@ -24,7 +24,7 @@
     </div>
     <div class="pull-right">
         {% if perms.taggit.change_tag %}
-            <a href="{% url 'extras:tag_edit' slug=tag.slug %}?return_url={% url 'extras:tag' slug=tag.slug %}" class="btn btn-warning">
+            <a href="{% url 'extras:tag_edit' slug=tag.slug %}" class="btn btn-warning">
                 <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span>
                 Edit this tag
             </a>