diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_create_with.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_create_with.js
index 967896cd12ee..46dc8f832666 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_create_with.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_create_with.js
@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { plusIconDark } from '../../images';
-import { runIrreversibleEvents, runGroupedEvents } from '../../../utils';
+import { runIrreversibleEvents, runGroupedEvents, modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_create_with = {
     protected_statements: ['STACK'],
@@ -77,6 +77,9 @@ Blockly.Blocks.lists_create_with = {
             });
         }
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 // Head's up! This is also the code generation for the "text_join" block.
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getIndex.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getIndex.js
index ab0319ee7a3b..1138261e9b80 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getIndex.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getIndex.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_getIndex = {
     init() {
@@ -95,6 +96,9 @@ Blockly.Blocks.lists_getIndex = {
 
         this.initSvg();
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_getIndex = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js
index 53d69df30831..79f146aa934f 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_getSublist.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_getSublist = {
     init() {
@@ -85,6 +86,9 @@ Blockly.Blocks.lists_getSublist = {
         //commented this line breaks the backward compatibility
         //this.render(false);
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_getSublist = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_indexOf.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_indexOf.js
index 0672ec7559ea..2c470fe65abe 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_indexOf.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_indexOf.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_indexOf = {
     init() {
@@ -54,6 +55,9 @@ Blockly.Blocks.lists_indexOf = {
             FIND: null,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_indexOf = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_isEmpty.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_isEmpty.js
index cf0c3346b717..a36ac5a94971 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_isEmpty.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_isEmpty.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_isEmpty = {
     init() {
@@ -37,6 +38,9 @@ Blockly.Blocks.lists_isEmpty = {
             VALUE: null,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_isEmpty = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_length.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_length.js
index b6eab4cc6318..15af52df7fc8 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_length.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_length.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_length = {
     init() {
@@ -34,6 +35,9 @@ Blockly.Blocks.lists_length = {
             VALUE: null,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_length = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_repeat.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_repeat.js
index a80a25688aa1..9f47da96fca9 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_repeat.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_repeat.js
@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { emptyTextValidator } from '../../../utils';
+import { emptyTextValidator, modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_repeat = {
     init() {
@@ -43,6 +43,9 @@ Blockly.Blocks.lists_repeat = {
             NUM: emptyTextValidator,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_repeat = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_setIndex.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_setIndex.js
index 9b71a5a0513c..a89ffb7d0161 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_setIndex.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_setIndex.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_setIndex = {
     init() {
@@ -75,6 +76,9 @@ Blockly.Blocks.lists_setIndex = {
         this.getInput('AT').appendField(menu, 'WHERE');
         this.initSvg();
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_setIndex = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_sort.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_sort.js
index 2f007538b5f8..2636c36b4223 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_sort.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_sort.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_sort = {
     init() {
@@ -56,6 +57,9 @@ Blockly.Blocks.lists_sort = {
             LIST: null,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_sort = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js
index 549baa2e9e37..267a3c155690 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_split.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_split = {
     init() {
@@ -70,6 +71,9 @@ Blockly.Blocks.lists_split = {
         this.initSvg();
         //this.render(false);
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_split = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_statement.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_statement.js
index cbc90a15876b..a1753290b29b 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_statement.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/List/lists_statement.js
@@ -1,6 +1,6 @@
 import { localize } from '@deriv/translations';
 import { minusIconDark } from '../../images';
-import { runIrreversibleEvents, runGroupedEvents } from '../../../utils';
+import { runIrreversibleEvents, runGroupedEvents, modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.lists_statement = {
     required_parent_type: 'lists_create_with',
@@ -82,6 +82,9 @@ Blockly.Blocks.lists_statement = {
             }
         }
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.lists_statement = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_flow_statements.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_flow_statements.js
index d5fe5cf1543f..a4558c45ebc1 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_flow_statements.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_flow_statements.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.controls_flow_statements = {
     init() {
@@ -37,6 +38,9 @@ Blockly.Blocks.controls_flow_statements = {
             ),
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.controls_flow_statements = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_for.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_for.js
index e8e37a938874..795166528c09 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_for.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_for.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.controls_for = {
     init() {
@@ -71,6 +72,9 @@ Blockly.Blocks.controls_for = {
             BY: null,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.controls_for = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_forEach.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_forEach.js
index 9f3a7fbb3a06..aed2c690b199 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_forEach.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_forEach.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.controls_forEach = {
     init() {
@@ -51,6 +52,9 @@ Blockly.Blocks.controls_forEach = {
             LIST: null,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.controls_forEach = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_repeat.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_repeat.js
index add19aa6fc87..87403117ab7e 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_repeat.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_repeat.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.controls_repeat = {
     init() {
@@ -43,6 +44,9 @@ Blockly.Blocks.controls_repeat = {
             ),
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.controls_repeat =
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_repeat_ext.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_repeat_ext.js
index 508b4811bdba..958ec76b36a5 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_repeat_ext.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_repeat_ext.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.controls_repeat_ext = {
     init() {
@@ -45,6 +46,9 @@ Blockly.Blocks.controls_repeat_ext = {
             TIMES: null,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.controls_repeat_ext = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_whileUntil.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_whileUntil.js
index ae38d53f486e..f7f8df6a6166 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_whileUntil.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/Loops/controls_whileUntil.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.controls_whileUntil = {
     init() {
@@ -50,6 +51,9 @@ Blockly.Blocks.controls_whileUntil = {
             BOOL: null,
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.controls_whileUntil = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/Variable/variables_get.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/Variable/variables_get.js
index c0a05346f943..3e16b32ef9ed 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/Variable/variables_get.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/Variable/variables_get.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.variables_get = {
     init() {
@@ -54,6 +55,9 @@ Blockly.Blocks.variables_get = {
             });
         }
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.variables_get = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Advanced/Variable/variables_set.js b/packages/bot-skeleton/src/scratch/blocks/Advanced/Variable/variables_set.js
index 635114b288b7..0340bade04e9 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Advanced/Variable/variables_set.js
+++ b/packages/bot-skeleton/src/scratch/blocks/Advanced/Variable/variables_set.js
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.variables_set = {
     init() {
@@ -37,6 +38,9 @@ Blockly.Blocks.variables_set = {
             description: localize('Assigns a given value to a variable'),
         };
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
 };
 
 Blockly.JavaScript.javascriptGenerator.forBlock.variables_set = block => {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/accumulator_take_profit.js b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/accumulator_take_profit.js
index 217815a49880..febd667d343c 100644
--- a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/accumulator_take_profit.js	
+++ b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/accumulator_take_profit.js	
@@ -1,6 +1,7 @@
 import { localize } from '@deriv/translations';
 import { getCurrencyDisplayCode } from '@deriv/shared';
 import { config } from '../../../../constants/config';
+import { modifyContextMenu } from '../../../utils';
 
 const description = localize(
     'Your contract is closed automatically when your profit is more than or equals to this amount. This block can only be used with the accumulator trade type.'
@@ -54,6 +55,9 @@ Blockly.Blocks.accumulator_take_profit = {
             this.setCurrency();
         }
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
     restricted_parents: ['trade_definition_accumulator'],
     setCurrency: Blockly.Blocks.trade_definition_tradeoptions.setCurrency,
     getRequiredValueInputs() {
diff --git a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_candleinterval.js b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_candleinterval.js
index b36e3a4b81a6..597453f97fae 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_candleinterval.js	
+++ b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_candleinterval.js	
@@ -1,5 +1,6 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.trade_definition_candleinterval = {
     init() {
@@ -29,6 +30,9 @@ Blockly.Blocks.trade_definition_candleinterval = {
 
         this.enforceLimitations();
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
     enforceLimitations: Blockly.Blocks.trade_definition_market.enforceLimitations,
 };
 Blockly.JavaScript.javascriptGenerator.forBlock.trade_definition_candleinterval = () => {};
diff --git a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_contracttype.js b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_contracttype.js
index 18b59b7767b4..f2bea32cb5d1 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_contracttype.js	
+++ b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_contracttype.js	
@@ -1,6 +1,7 @@
 import { localize } from '@deriv/translations';
 import { config } from '../../../../constants/config';
 import { getContractTypeOptions } from '../../../shared';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.trade_definition_contracttype = {
     init() {
@@ -59,6 +60,9 @@ Blockly.Blocks.trade_definition_contracttype = {
             }
         }
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
     enforceLimitations: Blockly.Blocks.trade_definition_market.enforceLimitations,
 };
 Blockly.JavaScript.javascriptGenerator.forBlock.trade_definition_contracttype = () => '';
diff --git a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_market.js b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_market.js
index 344d5bbf2fd8..a91fb611df78 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_market.js	
+++ b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_market.js	
@@ -1,5 +1,5 @@
 import { localize } from '@deriv/translations';
-import { runIrreversibleEvents } from '../../../utils';
+import { runIrreversibleEvents, modifyContextMenu } from '../../../utils';
 import ApiHelpers from '../../../../services/api/api-helpers';
 
 /* eslint-disable */
@@ -38,6 +38,9 @@ Blockly.Blocks.trade_definition_market = {
         this.setMovable(false);
         this.setDeletable(false);
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
     onchange(event) {
         const allowed_events = ['BLOCK_CREATE', 'BLOCK_CHANGE', 'BLOCK_DRAG'];
         const is_allowed_event =
diff --git a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_restartbuysell.js b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_restartbuysell.js
index a41159e37626..d790271b520e 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_restartbuysell.js	
+++ b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_restartbuysell.js	
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.trade_definition_restartbuysell = {
     init() {
@@ -37,6 +38,9 @@ Blockly.Blocks.trade_definition_restartbuysell = {
 
         this.enforceLimitations();
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
     enforceLimitations: Blockly.Blocks.trade_definition_market.enforceLimitations,
     required_inputs: ['TIME_MACHINE_ENABLED'],
 };
diff --git a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_restartonerror.js b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_restartonerror.js
index b30976ec56c8..9831390a403c 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_restartonerror.js	
+++ b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_restartonerror.js	
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.trade_definition_restartonerror = {
     init() {
@@ -32,6 +33,9 @@ Blockly.Blocks.trade_definition_restartonerror = {
 
         this.enforceLimitations();
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
     enforceLimitations: Blockly.Blocks.trade_definition_market.enforceLimitations,
     required_inputs: ['RESTARTONERROR'],
 };
diff --git a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_tradetype.js b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_tradetype.js
index 233485c3fd1f..6c6c2603a79b 100755
--- a/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_tradetype.js	
+++ b/packages/bot-skeleton/src/scratch/blocks/Binary/Trade Definition/trade_definition_tradetype.js	
@@ -1,4 +1,5 @@
 import { localize } from '@deriv/translations';
+import { modifyContextMenu } from '../../../utils';
 
 Blockly.Blocks.trade_definition_tradetype = {
     init() {
@@ -28,6 +29,9 @@ Blockly.Blocks.trade_definition_tradetype = {
         this.setMovable(false);
         this.setDeletable(false);
     },
+    customContextMenu(menu) {
+        modifyContextMenu(menu);
+    },
     enforceLimitations: Blockly.Blocks.trade_definition_market.enforceLimitations,
 };
 
diff --git a/packages/bot-skeleton/src/scratch/utils/index.js b/packages/bot-skeleton/src/scratch/utils/index.js
index 4db35dc8cea4..01e2e7710064 100644
--- a/packages/bot-skeleton/src/scratch/utils/index.js
+++ b/packages/bot-skeleton/src/scratch/utils/index.js
@@ -622,9 +622,11 @@ const common_included_items = [download_option];
 const all_context_menu_options = [
     localize('Duplicate'),
     localize('Add Comment'),
+    localize('Remove Comment'),
     localize('Collapse Block'),
     localize('Expand Block'),
     localize('Disable Block'),
+    localize('Enable Block'),
     localize('Download Block'),
 ];