diff --git a/packages/node_modules/@node-red/nodes/core/common/20-inject.html b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
index aecb20347..8e40b8cd8 100644
--- a/packages/node_modules/@node-red/nodes/core/common/20-inject.html
+++ b/packages/node_modules/@node-red/nodes/core/common/20-inject.html
@@ -488,12 +488,12 @@
             /* */
 
             var eList = $('#node-input-property-container').css('min-height','120px').css('min-width','450px');
+
             eList.editableList({
                 buttons: [
                     {
                         id: "node-inject-test-inject-button",
-                        label: node._("inject.inject"),
-                        icon: "fa fa-bolt",
+                        label: node._("inject.injectNow"),
                         click: function(e) {
                             var items = eList.editableList('items');
                             var result = getProps(items);
@@ -538,7 +538,11 @@
                 removable: true,
                 sortable: true
             });
-            $('#node-inject-test-inject-button').addClass('primary').css("float", "right").css("margin-right", "unset");
+            $('#node-inject-test-inject-button').css("float", "right").css("margin-right", "unset");
+
+            if (RED.nodes.subflow(node.z)) {
+                $('#node-inject-test-inject-button').attr("disabled",true);
+            }
 
             if (!node.props) {
                 var payload = {
diff --git a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
index 6945ee8ae..e5108710b 100755
--- a/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
+++ b/packages/node_modules/@node-red/nodes/locales/en-US/messages.json
@@ -32,6 +32,7 @@
     },
     "inject": {
         "inject": "inject",
+        "injectNow": "inject now",
         "repeat": "repeat = __repeat__",
         "crontab": "crontab = __crontab__",
         "stopped": "stopped",