diff --git a/workflow/engine/classes/model/Dashboard.php b/workflow/engine/classes/model/Dashboard.php
index fb38e1778..cef1366e1 100644
--- a/workflow/engine/classes/model/Dashboard.php
+++ b/workflow/engine/classes/model/Dashboard.php
@@ -35,9 +35,10 @@ class Dashboard extends BaseDashboard
         try {
 
             if (!isset($data['DAS_UID'])) {
+
+                $dashboard = new Dashboard();
                 $data['DAS_UID'] = G::generateUniqueID();
                 $data['DAS_CREATE_DATE'] = date('Y-m-d H:i:s');
-                $dashboard = new Dashboard();
                 $msg = 'Create ';
             } else {
                 $msg = 'Update ';
@@ -46,8 +47,11 @@ class Dashboard extends BaseDashboard
 
             G::LoadSystem('inputfilter');
             $filter = new InputFilter();
+            if (isset($data['DAS_TITLE'])) {
+                $data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string");
+            }
+
             $data['DAS_UPDATE_DATE'] = date('Y-m-d H:i:s');
-            $data['DAS_TITLE'] = $filter ->validateInput($data['DAS_TITLE'], "string");
             $dashboard->fromArray($data, BasePeer::TYPE_FIELDNAME);
             if ($dashboard->validate()) {
                 $connection->begin();
diff --git a/workflow/engine/templates/strategicDashboard/dashboardList.js b/workflow/engine/templates/strategicDashboard/dashboardList.js
index a7c6ea72a..9b96258b5 100644
--- a/workflow/engine/templates/strategicDashboard/dashboardList.js
+++ b/workflow/engine/templates/strategicDashboard/dashboardList.js
@@ -311,7 +311,7 @@ newDashboard = function() {
 //Edit Dashboard  Action
 editDashboard = function() {
     var rowSelected = infoGrid.getSelectionModel().getSelected();
-    if (rowSelected){
+    if (rowSelected && rowSelected.data.DAS_STATUS == 1 ){
         location.href = 'formEditDashboard?DAS_UID=' + rowSelected.data.DAS_UID;
     }
 };