diff --git a/app/components/webhook/new-receiver/component.js b/app/components/webhook/new-receiver/component.js
index b46ccceae..f089618e4 100644
--- a/app/components/webhook/new-receiver/component.js
+++ b/app/components/webhook/new-receiver/component.js
@@ -58,6 +58,10 @@ export default Ember.Component.extend(NewOrEdit, {
     if ( !this.get(`model.${driver}Config`) ) {
       this.set(`model.${driver}Config`, def);
     }
+
+    setTimeout(() => {
+      this.$('INPUT')[0].focus();
+    }, 500);
   },
 
   scaleHostActionChanged: function() {
diff --git a/app/registries/new/controller.js b/app/registries/new/controller.js
index d4edeef14..28a19d0e5 100644
--- a/app/registries/new/controller.js
+++ b/app/registries/new/controller.js
@@ -10,6 +10,9 @@ export default Ember.Controller.extend(NewOrEdit, {
 
   actions: {
     selectDriver: function(name) {
+      setTimeout(() => {
+        $('main INPUT')[0].focus();
+      }, 500);
       var driver = this.get('drivers').filterBy('name',name)[0];
       this.set('activeDriver', driver.name);
       this.set('model.registry.serverAddress', driver.value);