diff --git a/javascript/src/QfqForm.js b/javascript/src/QfqForm.js
index 7f2cb3093b7f701ce9f7cd06f5c4be6709cd8c14..bdb4a5d5a30fcc31288f17724f79f13c3bc41d0d 100644
--- a/javascript/src/QfqForm.js
+++ b/javascript/src/QfqForm.js
@@ -955,6 +955,13 @@ var QfqNS = QfqNS || {};
                     alert.show();
                 }
 
+                // Skip other checks if external Save is called
+                if (this.goToAfterSave) {
+                    console.log("Called goToAfterSave = " + this.goToAfterSave);
+                    window.location = this.goToAfterSave;
+                    return;
+                }
+
                 // do we have to update the HTML Form?
                 if (data['form-update']) {
                     this.applyFormConfiguration(data['form-update']);
@@ -973,12 +980,6 @@ var QfqNS = QfqNS || {};
                     return;
                 }
 
-                if (this.goToAfterSave) {
-                    console.log("Called goToAfterSave = " + this.goToAfterSave);
-                    window.location = this.goToAfterSave;
-                    return;
-                }
-
                 break;
             case 'close':
                 if (!data.redirect || data.redirect === "no") {