diff --git a/conda/js/src/components/toolchain/ToolchainEditor.jsx b/conda/js/src/components/toolchain/ToolchainEditor.jsx
index 564d7c702c517ba1ba3e7aaae5403477a0659e89..a6dbe35ba4297c7cd84708fb084071d3402f9172 100644
--- a/conda/js/src/components/toolchain/ToolchainEditor.jsx
+++ b/conda/js/src/components/toolchain/ToolchainEditor.jsx
@@ -139,10 +139,7 @@ export class ToolchainEditor extends React.PureComponent<Props, State> {
 	componentWillReceiveProps = (nextProps: Props) => {
 		this.setState({
 			cache: getValidObj(nextProps.data),
-			history: {
-				past: [],
-				future: [],
-			},
+			history: generateNewHistory(this.state),
 		});
 	}