diff --git a/public/scripts/views/ui/modal.js b/public/scripts/views/ui/modal.js
index de3eec5bc1..0094e5a081 100644
--- a/public/scripts/views/ui/modal.js
+++ b/public/scripts/views/ui/modal.js
@@ -82,6 +82,22 @@
 
         element.classList.add("open");
         element.classList.remove("close");
+
+        let form = element.querySelector('form');
+        let elements = [...form.elements] || [];
+
+        for (let index = 0; index < elements.length; index++) {
+          let element = elements[index];
+
+          if(element.type !== 'hidden'
+            && element.type !== 'button'
+            && element.type !== 'submit'
+          ) {
+              console.log(element.type);
+            element.focus();
+            break;
+          }
+        }
       };
 
       let close = function(event) {