diff --git a/beat/web/algorithms/templates/algorithms/edition.html b/beat/web/algorithms/templates/algorithms/edition.html
index f97dfb546a03de4a79d5d6b3a6a81576eddd84be..91ebf64c877a613bcfb73ead50347cf1b1871144 100644
--- a/beat/web/algorithms/templates/algorithms/edition.html
+++ b/beat/web/algorithms/templates/algorithms/edition.html
@@ -184,7 +184,7 @@ function setupEditor(algorithm, dataformats, libraries)
   });
 
 
-{% if not binary %}
+{% if not edition and not binary %}
   // Language radio buttons handling
   var language_python_selector = $('#language_python');
   var language_cxx_selector = $('#language_cxx');
@@ -261,7 +261,7 @@ function setupEditor(algorithm, dataformats, libraries)
     if (declaration.parameters === null)
       return false;
 
-{% if not binary %}
+{% if not edition and not binary %}
     if (language_python_selector[0].checked)
     {
       declaration.uses = libraries_panel.getLibraries(displayErrors);
@@ -288,8 +288,7 @@ function setupEditor(algorithm, dataformats, libraries)
     };
 
 {% if not binary %}
-    if (language_python_selector[0].checked)
-      data.code = source_code_editor.getSourceCode();
+    data.code = source_code_editor.getSourceCode();
 {% endif %}