diff --git a/beat/web/toolchains/templates/toolchains/edition.html b/beat/web/toolchains/templates/toolchains/edition.html
index 6970f352b1ffdacacb51b83b9c15fa5283332f77..25f6db4b3a7fe53348e56895f106ad57983f0936 100644
--- a/beat/web/toolchains/templates/toolchains/edition.html
+++ b/beat/web/toolchains/templates/toolchains/edition.html
@@ -205,7 +205,11 @@ function setupEditor(databases, toolchains)
   };
 
   toolchain_editor.callbacks.onClose = function(declaration) {
+{% if not edition %}
+    window.location = '{% url "toolchains:list" toolchain_author %}';
+{% else %}
     window.location = '{% url "toolchains:view" toolchain_author toolchain_name toolchain_version %}';
+{% endif %}
   };
 }