diff --git a/client/src/app/tabs/robot/BottomPanel/Deployment/DeploymentForm.js b/client/src/app/tabs/robot/BottomPanel/Deployment/DeploymentForm.js
index cc20deb3fa..ac499e03d3 100644
--- a/client/src/app/tabs/robot/BottomPanel/Deployment/DeploymentForm.js
+++ b/client/src/app/tabs/robot/BottomPanel/Deployment/DeploymentForm.js
@@ -45,6 +45,8 @@ export default function DeploymentForm(props) {
     onAction
   } = props;
 
+  console.log(id + 'robotTab');
+
   const [ defaultValues, setValues ] = useLocalState(id + 'robotTab', {
     'name': name.split('.')[0],
     'endpoint': 'http://localhost:36227/',
diff --git a/client/src/app/tabs/robot/BottomPanel/Run/RobotOutputTab.js b/client/src/app/tabs/robot/BottomPanel/Run/RobotOutputTab.js
index 3d2877b192..fe9c5632a0 100644
--- a/client/src/app/tabs/robot/BottomPanel/Run/RobotOutputTab.js
+++ b/client/src/app/tabs/robot/BottomPanel/Run/RobotOutputTab.js
@@ -29,7 +29,6 @@ export default function RobotOutputTab(props) {
   const [ output, setOutput ] = useLocalState(id + 'output', '');
   const [ isRunning, setIsRunning ] = useState(false);
 
-
   return <>
     <Fill slot="bottom-panel"
       id="robot-output"
@@ -43,7 +42,7 @@ export default function RobotOutputTab(props) {
             <Column span={ 4 }>
               <Tile>
                 <Layer>
-                  <CarbonRunForm { ...props } setOutput={ setOutput } isRunning={ isRunning } setIsRunning={ setIsRunning } />
+                  <CarbonRunForm key={ props.id } { ...props } setOutput={ setOutput } isRunning={ isRunning } setIsRunning={ setIsRunning } />
                 </Layer>
               </Tile>
             </Column>
@@ -147,6 +146,8 @@ function CarbonRunForm(props) {
     id
   } = props;
 
+  console.log(id + 'robotTab');
+
   const [ values, setValues ] = useLocalState(id + 'robotTab', {
     'name': name?.split('.')?.[0],
     'endpoint': 'http://localhost:36227/',
diff --git a/client/src/app/tabs/robot/BottomPanel/index.js b/client/src/app/tabs/robot/BottomPanel/index.js
index 99e88b54ad..02b3f70f18 100644
--- a/client/src/app/tabs/robot/BottomPanel/index.js
+++ b/client/src/app/tabs/robot/BottomPanel/index.js
@@ -18,8 +18,8 @@ import EngineInfo from './EngineInfo';
 export default function(props) {
   return <>
     <EngineInfo />
-    <DeploymentButton { ...props }></DeploymentButton>
-    <Run { ...props }></Run>
+    <DeploymentButton key={ props.id } { ...props }></DeploymentButton>
+    <Run key={ props.id } { ...props }></Run>
   </>;
 
 }
diff --git a/client/src/app/tabs/robot/RobotEditor.js b/client/src/app/tabs/robot/RobotEditor.js
index 524782e58a..ec9550f90b 100644
--- a/client/src/app/tabs/robot/RobotEditor.js
+++ b/client/src/app/tabs/robot/RobotEditor.js
@@ -185,6 +185,7 @@ export class RobotEditor extends CachedComponent {
           name={ this.props.file?.name }
           id={ this.props.id }
           onAction={ this.props.onAction }
+          key={ this.props.id }
           { ...this.props }
         />
       </div>