2 files changed, 6 insertions, 3 deletions
diff --git a/src/reducers/current-ids.js b/src/reducers/current-ids.js
index c94d7861..c92ff93b 100644
--- a/src/reducers/current-ids.js
+++ b/src/reducers/current-ids.js
@@ -1,9 +1,10 @@
+import {OPEN_EXPERIMENT_SUCCEEDED} from "../actions/experiments";
 import {OPEN_SIMULATION_SUCCEEDED} from "../actions/simulations";
-import {FETCH_LATEST_DATACENTER_SUCCEEDED, RESET_CURRENT_DATACENTER} from "../actions/topology/building";
+import {RESET_CURRENT_DATACENTER, SET_CURRENT_DATACENTER} from "../actions/topology/building";
 
 export function currentDatacenterId(state = -1, action) {
     switch (action.type) {
-        case FETCH_LATEST_DATACENTER_SUCCEEDED:
+        case SET_CURRENT_DATACENTER:
             return action.datacenterId;
         case RESET_CURRENT_DATACENTER:
             return -1;
@@ -16,6 +17,8 @@ export function currentSimulationId(state = -1, action) {
     switch (action.type) {
         case OPEN_SIMULATION_SUCCEEDED:
             return action.id;
+        case OPEN_EXPERIMENT_SUCCEEDED:
+            return action.simulationId;
         default:
             return state;
     }
diff --git a/src/reducers/simulation-mode.js b/src/reducers/simulation-mode.js
index da6aa94a..60084824 100644
--- a/src/reducers/simulation-mode.js
+++ b/src/reducers/simulation-mode.js
@@ -6,7 +6,7 @@ import {GO_TO_TICK, SET_LAST_SIMULATED_TICK} from "../actions/simulation/tick";
 export function currentExperimentId(state = -1, action) {
     switch (action.type) {
         case OPEN_EXPERIMENT_SUCCEEDED:
-            return action.id;
+            return action.experimentId;
         default:
             return state;
     }