diff --git a/packages/node_modules/@node-red/nodes/core/function/rbe.html b/packages/node_modules/@node-red/nodes/core/function/rbe.html
index 6f8938870..11ff18860 100644
--- a/packages/node_modules/@node-red/nodes/core/function/rbe.html
+++ b/packages/node_modules/@node-red/nodes/core/function/rbe.html
@@ -27,10 +27,14 @@
         <label for="node-input-property"><i class="fa fa-ellipsis-h"></i> <span data-i18n="node-red:common.label.property"></span></label>
         <input type="text" id="node-input-property" style="width:70%;"/>
     </div>
-    <div class="form-row">
+    <div class="form-row" style="margin-bottom: 0px;">
         <label> </label>
         <input type="checkbox" id="node-input-septopics" style="display:inline-block; width:20px; vertical-align:baseline;">
-        <span data-i18n="rbe.label.septopics"></span> <input type="text" id="node-input-topi" style="width:27%;"/>
+        <label style="width: auto" for="node-input-septopics" data-i18n="rbe.label.septopics"></label>
+    </div>
+    <div class="form-row">
+        <label> </label>
+        <input type="text" id="node-input-topi"  style="width:70%;"/>
     </div>
     <div class="form-row">
         <label for="node-input-name"><i class="fa fa-tag"></i> <span data-i18n="rbe.label.name"></span></label>
@@ -70,6 +74,10 @@
             if (this.septopics === undefined) {
                 $("#node-input-septopics").prop('checked', true);
             }
+            if (this.topi === undefined) {
+                $("#node-input-topi").val("topic");
+            }
+
             $("#node-input-property").typedInput({default:'msg',types:['msg']});
             $("#node-input-topi").typedInput({default:'msg',types:['msg']});
             //$( "#node-input-gap" ).spinner({min:0});
@@ -88,6 +96,11 @@
                     $("#node-startvalue").hide();
                 }
             });
+            $("#node-input-septopics").on("change", function() {
+                $("#node-input-topi").typedInput("disable",!this.checked);
+            })
+            $("#node-input-topi").typedInput("disable",!!!this.septopics);
+
         }
     });
 </script>