diff --git a/DesignerSpace/Workspace/Workspace.js b/DesignerSpace/Workspace/Workspace.js
index 1c43e2a9b..2b150a4e8 100644
--- a/DesignerSpace/Workspace/Workspace.js
+++ b/DesignerSpace/Workspace/Workspace.js
@@ -161,7 +161,9 @@ function newWorkspace () {
               for (k = 0; k < taskManager.tasks.length; k++) {
                 let task = taskManager.tasks[k]
                 if (task.bot.type === 'Trading Bot Instance') {
-                  tradingBotInstances.push(task.bot)
+                  if (task.bot.payload.floatingObject.isCollapsed !== true) {
+                    tradingBotInstances.push(task.bot)
+                  }
                 }
               }
             }
diff --git a/Panels/ProductsPanel.js b/Panels/ProductsPanel.js
index 32f500524..a8a0339d8 100644
--- a/Panels/ProductsPanel.js
+++ b/Panels/ProductsPanel.js
@@ -313,27 +313,28 @@ function newProductsPanel () {
                 if (process.session !== undefined) {
                   if (process.session.layerManager !== undefined) {
                     let layerManager = process.session.layerManager
+                    if (layerManager.payload.floatingObject.isCollapsed !== true) {
+                      if (bot.products !== undefined) {
+                        for (let k = 0; k < bot.products.length; k++) {
+                          let product = bot.products[k]
 
-                    if (bot.products !== undefined) {
-                      for (let k = 0; k < bot.products.length; k++) {
-                        let product = bot.products[k]
-
-                        for (let p = 0; p < layerManager.layers.length; p++) {
-                          let layer = layerManager.layers[p]
-                          let layerCode
-                          try {
-                            layerCode = JSON.parse(layer.code)
-                          } catch (err) {
+                          for (let p = 0; p < layerManager.layers.length; p++) {
+                            let layer = layerManager.layers[p]
+                            let layerCode
+                            try {
+                              layerCode = JSON.parse(layer.code)
+                            } catch (err) {
                               // if we can not parse this, then we ignore this trading engine.
-                          }
+                            }
 
-                          if (product.codeName === layerCode.product) {
+                            if (product.codeName === layerCode.product) {
                               /* We have a layer that is matching the current product */
-                            let cardCode = exchange + '-' + market.assetB + '/' + market.assetA + '-' + devTeam.codeName + '-' + bot.codeName + '-' + product.codeName + '-' + process.session.id
-                            let cardFound = removeFromLocalProductCards(cardCode)
-                            if (cardFound !== true) {
-                              productCard = addProductCard(devTeam, bot, product, process.session)
-                              onProductCardStatusChanged(productCard)
+                              let cardCode = exchange + '-' + market.assetB + '/' + market.assetA + '-' + devTeam.codeName + '-' + bot.codeName + '-' + product.codeName + '-' + process.session.id
+                              let cardFound = removeFromLocalProductCards(cardCode)
+                              if (cardFound !== true) {
+                                productCard = addProductCard(devTeam, bot, product, process.session)
+                                onProductCardStatusChanged(productCard)
+                              }
                             }
                           }
                         }