diff --git a/nodes/core/80-function.html b/nodes/core/80-function.html
index f4090f801..68b71cc75 100644
--- a/nodes/core/80-function.html
+++ b/nodes/core/80-function.html
@@ -21,7 +21,7 @@
     </div>
     <div class="form-row">
         <label for="node-input-func"><i class="icon-wrench"></i> Function</label>
-        <input type="hidden" id="node-input-func">
+        <input type="hidden" id="node-input-func" autofocus="autofocus">
         <div style="height: 250px;" class="node-text-editor" id="node-input-func-editor" ></div>
     </div>
     <div class="form-row">
@@ -85,6 +85,7 @@
                     editor:that.editor, // the field name the main text body goes to
                     fields:['name','outputs']
                 });
+                $("#node-input-name").focus();
 
             });
         },
diff --git a/nodes/core/80-template.html b/nodes/core/80-template.html
index f0a024173..8d7c8ddd1 100644
--- a/nodes/core/80-template.html
+++ b/nodes/core/80-template.html
@@ -22,7 +22,7 @@
 
     <div class="form-row">
         <label for="node-input-template"><i class="icon-wrench"></i> Template</label>
-        <input type="hidden" id="node-input-template">
+        <input type="hidden" id="node-input-template" autofocus="autofocus">
         <div style="height: 250px;" class="node-text-editor" id="node-input-template-editor" ></div>
     </div>
 
@@ -79,7 +79,7 @@
                     editor:that.editor, // the field name the main text body goes to
                     fields:['name']
                 });
-
+                $("#node-input-name").focus();
             });
         },
         oneditsave: function() {
diff --git a/nodes/core/90-comment.html b/nodes/core/90-comment.html
index 86b8922cb..b909b5d1f 100644
--- a/nodes/core/90-comment.html
+++ b/nodes/core/90-comment.html
@@ -21,7 +21,7 @@
 	</div>
 	<div class="form-row">
         <label for="node-input-info" style="width: 100% !important;"><i class="icon-file"></i> More</label>
-        <input type="hidden" id="node-input-info">
+        <input type="hidden" id="node-input-info" autofocus="autofocus">
         <div style="height: 250px;" class="node-text-editor" id="node-input-info-editor" ></div>
     </div>
     <div class="form-tips">Tip: this isn't meant for War and Peace - but useful notes can be kept here.</div>
@@ -75,6 +75,7 @@
                     showFoldingRuler:false,
                     contents: $("#node-input-info").val()
                 });
+                $("#node-input-name").focus();
             });
         },
         oneditsave: function() {