diff --git a/gadjo/static/js/gadjo.js b/gadjo/static/js/gadjo.js
index 3d7be9b..9b66d48 100644
--- a/gadjo/static/js/gadjo.js
+++ b/gadjo/static/js/gadjo.js
@@ -250,8 +250,9 @@ var gadjo_js = gadjo_js || {};
                     $content.dialog('option', 'buttons', buttons);
 
                     /* focus initial input field */
-                    if ($form.find('input:visible').length) {
-                        $form.find('input:visible')[0].focus();
+                    var $form_fields = $form.find('input:visible, textarea:visible, select:visible');
+                    if ($form_fields.length) {
+                        $form_fields[0].focus();
                     }
 
                     /* if received content was in json, apply jQuery Form plugin on it */