diff --git a/src/ic/ic-data-data-manager.js b/src/ic/ic-data-data-manager.js
index b26675c..087b294 100644
--- a/src/ic/ic-data-data-manager.js
+++ b/src/ic/ic-data-data-manager.js
@@ -44,15 +44,25 @@ class IcDataDataManager {
     }
   }
 
-  getStatus(url,socketname,token,icid){
+  getStatus(url,socketname,token,icid,ic){
     RestAPI.get(url, null).then(response => {
+      let tempIC = ic;
+      tempIC.state = response.state;
       AppDispatcher.dispatch({
         type: 'ic-status/status-received',
         data: response,
         token: token,
         socketname: socketname,
         icid: icid,
+        ic: ic
       });
+      if(!ic.managedexternally){  
+        AppDispatcher.dispatch({
+          type: 'ics/start-edit',
+          data: tempIC,
+          token: token,
+        });
+      }
     }).catch(error => {
       AppDispatcher.dispatch({
         type: 'ic-status/status-error',
diff --git a/src/ic/ic-status-store.js b/src/ic/ic-status-store.js
index 62d6d08..36526c6 100644
--- a/src/ic/ic-status-store.js
+++ b/src/ic/ic-status-store.js
@@ -28,7 +28,7 @@ class ICStatusStore extends ArrayStore {
     switch(action.type) {
 
       case 'ic-status/get-status':
-        ICDataDataManager.getStatus(action.url, action.socketname, action.token, action.icid);
+        ICDataDataManager.getStatus(action.url, action.socketname, action.token, action.icid, action.ic);
         return super.reduce(state, action);
 
       case 'ic-status/status-received':
diff --git a/src/ic/ic-store.js b/src/ic/ic-store.js
index 78e90ac..acc6c1e 100644
--- a/src/ic/ic-store.js
+++ b/src/ic/ic-store.js
@@ -38,6 +38,7 @@ class InfrastructureComponentStore extends ArrayStore {
               socketname: splitWebsocketURL[splitWebsocketURL.length - 1],
               token: action.token,
               icid: ic.id,
+              ic: ic
             });
   
             AppDispatcher.dispatch({