diff --git a/etemplate/js/et2_widget_dialog.js b/etemplate/js/et2_widget_dialog.js
index 01885d6d83..48e4e5bf9e 100644
--- a/etemplate/js/et2_widget_dialog.js
+++ b/etemplate/js/et2_widget_dialog.js
@@ -416,7 +416,10 @@ var et2_dialog = et2_widget.extend({
 		if(template.indexOf('.xet') > 0)
 		{
 			// File name provided, fetch from server
-			this.template.load("",template,this.options.value||{});
+			this.template.load("",template,this.options.value||{}, jQuery.proxy(function() {
+				// Set focus to the first input
+				$j('input',this.div).first().focus();
+			},this));
 		}
 		else
 		{