diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js
index a876b82de6..1b1c662120 100644
--- a/src/sunstone/public/app/sunstone.js
+++ b/src/sunstone/public/app/sunstone.js
@@ -740,6 +740,7 @@ define(function(require) {
         } // Panel not defined
 
         formPanelInstance = new formPanel();
+        formPanelInstance.setAction(formContext, action);
         tab["formPanelInstances"][formPanelId] = formPanelInstance;
         formPanelInstance.insert(formContext);
       }
diff --git a/src/sunstone/public/app/utils/form-panels/form-panel.js b/src/sunstone/public/app/utils/form-panels/form-panel.js
index 2e8ab1036a..bfc3964465 100644
--- a/src/sunstone/public/app/utils/form-panels/form-panel.js
+++ b/src/sunstone/public/app/utils/form-panels/form-panel.js
@@ -67,7 +67,7 @@ define(function(require) {
 
     this.action = action;
 
-    if ((prevAction && prevAction != action) || action == "update") {
+    if (prevAction != undefined && (prevAction != action || action == "update")) {
       this.reset(context);
     }
   }