2 files changed, 17 insertions, 5 deletions
diff --git a/src/containers/experiments/ExperimentListContainer.js b/src/containers/experiments/ExperimentListContainer.js
index 38e5a9f6..0c6818fa 100644
--- a/src/containers/experiments/ExperimentListContainer.js
+++ b/src/containers/experiments/ExperimentListContainer.js
@@ -2,7 +2,7 @@ import {connect} from "react-redux";
 import ExperimentListComponent from "../../components/experiments/ExperimentListComponent";
 
 const mapStateToProps = state => {
-    if (!state.currentSimulationId) {
+    if (state.currentSimulationId === -1 || !("experimentIds" in state.objects.simulation[state.currentSimulationId])) {
         return {
             experimentIds: [],
         };
@@ -14,10 +14,6 @@ const mapStateToProps = state => {
             experimentIds,
         };
     }
-
-    return {
-        experimentIds: [],
-    };
 };
 
 const ExperimentListContainer = connect(
diff --git a/src/containers/experiments/NewExperimentButtonContainer.js b/src/containers/experiments/NewExperimentButtonContainer.js
new file mode 100644
index 00000000..1abbb7b7
--- /dev/null
+++ b/src/containers/experiments/NewExperimentButtonContainer.js
@@ -0,0 +1,16 @@
+import {connect} from "react-redux";
+import {openNewExperimentModal} from "../../actions/modals/experiments";
+import NewExperimentButtonComponent from "../../components/experiments/NewExperimentButtonComponent";
+
+const mapDispatchToProps = dispatch => {
+    return {
+        onClick: () => dispatch(openNewExperimentModal())
+    };
+};
+
+const NewExperimentButtonContainer = connect(
+    undefined,
+    mapDispatchToProps
+)(NewExperimentButtonComponent);
+
+export default NewExperimentButtonContainer;