diff --git a/src/api/forms/FormsAPI.js b/src/api/forms/FormsAPI.js
index 8f88c4253d..e6cf746335 100644
--- a/src/api/forms/FormsAPI.js
+++ b/src/api/forms/FormsAPI.js
@@ -172,7 +172,9 @@ export default class FormsAPI {
 
         function onFormSave(save) {
             return () => {
-                if (overlay) {
+                if (element) {
+                    formElement.remove();
+                } else {
                     overlay.dismiss();
                 }