diff --git a/APPL/SCF/scaffolding_edit.inc b/APPL/SCF/scaffolding_edit.inc
index 51e221cbb2..ab1f854535 100644
--- a/APPL/SCF/scaffolding_edit.inc
+++ b/APPL/SCF/scaffolding_edit.inc
@@ -106,6 +106,14 @@ function scaffolding_edit(model, scf_params)
       <head>
     <%  FCLTHeader.Generate(); %>
         <script>
+          function scf_submit_callback(json)
+          {
+              if (json.success)
+                  FcltMgr.closeDetail(window, json);
+              else
+                  iface.button.enable("btn_scf_submit");
+          }
+
           function scf_submit()
           {
             if (!validateForm("u2"))
@@ -117,7 +125,7 @@ function scaffolding_edit(model, scf_params)
                     return false;
             }
 
-            $.post($("form[name=u2]")[0].getAttribute("action"), $("[name=u2]").serialize(), FcltCallbackClose, "json");
+            $.post($("form[name=u2]")[0].getAttribute("action"), $("[name=u2]").serialize(), FcltCallbackAndThenAlways(scf_submit_callback), "json");
             return true; // disable button
           }
 
