diff --git a/CHANGES.txt b/CHANGES.txt
index 18ac0c4..5177ac7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,8 +4,8 @@ Changelog
 2.2.1 (unreleased)
 ------------------
 
-- Submit form using other jquery selector so FF and Chrome don't crash
-  fixes #13037
+- Remove submitting the controlpanel form again after removing disabled tags
+  fixes #13037 and #12357
   [maartenkling]
 
 - Remove inline styles, fixes #12399
diff --git a/plone/app/discussion/browser/javascripts/controlpanel.js b/plone/app/discussion/browser/javascripts/controlpanel.js
index 9266fbe..8449f6e 100644
--- a/plone/app/discussion/browser/javascripts/controlpanel.js
+++ b/plone/app/discussion/browser/javascripts/controlpanel.js
@@ -120,7 +120,6 @@
          **********************************************************************/
         $("form#DiscussionSettingsEditForm").bind("submit", function (e) {
             $(this).find("input,select").removeAttr('disabled');
-            $("form#DiscussionSettingsEditForm").submit();
         });
 
     });