diff --git a/frontend/src/views/Settings.vue b/frontend/src/views/Settings.vue
index 0232d75..13eaadc 100644
--- a/frontend/src/views/Settings.vue
+++ b/frontend/src/views/Settings.vue
@@ -558,6 +558,11 @@ export default Vue.extend({
         tls_enabled: true,
         tls_skip_verify: false,
       });
+
+      this.$nextTick(() => {
+        const items = document.querySelectorAll('.mail-servers input[name="host"]');
+        items[items.length - 1].focus();
+      });
     },
 
     removeSMTP(i) {
@@ -581,6 +586,11 @@ export default Vue.extend({
         max_msg_retries: 2,
         timeout: '5s',
       });
+
+      this.$nextTick(() => {
+        const items = document.querySelectorAll('.messengers input[name="name"]');
+        items[items.length - 1].focus();
+      });
     },
 
     removeMessenger(i) {