diff --git a/editor/js/ui/editors/js.js b/editor/js/ui/editors/js.js
index cfb5a61c1..cc50ead2b 100644
--- a/editor/js/ui/editors/js.js
+++ b/editor/js/ui/editors/js.js
@@ -32,7 +32,7 @@ RED.editor.types._js = (function() {
 
             var trayOptions = {
                 title: options.title,
-                width: "inherit",
+                width: options.width||"inherit",
                 buttons: [
                     {
                         id: "node-dialog-cancel",
diff --git a/nodes/core/core/80-function.html b/nodes/core/core/80-function.html
index e406e9d16..20b98fadc 100644
--- a/nodes/core/core/80-function.html
+++ b/nodes/core/core/80-function.html
@@ -126,6 +126,7 @@
                 var value = that.editor.getValue();
                 RED.editor.editJavaScript({
                     value: value,
+                    width: "Infinity",
                     cursor: that.editor.getCursorPosition(),
                     complete: function(v,cursor) {
                         that.editor.setValue(v, -1);