diff --git a/webapp/components/features/FollowList/FollowList.vue b/webapp/components/features/FollowList/FollowList.vue
index 6199ad95c..a5ed02713 100644
--- a/webapp/components/features/FollowList/FollowList.vue
+++ b/webapp/components/features/FollowList/FollowList.vue
@@ -143,8 +143,12 @@ export default {
     color: $text-color-soft;
   }
 
-  .spacer-x-small {
-    margin: $space-x-small 0;
-  }
+> :nth-child(n):not(:last-child) {
+    margin-bottom: $space-small;
+}
+
+.user-teaser {
+    margin-bottom: $space-x-small;
+}
 }
 </style>
diff --git a/webapp/plugins/vue-directives.js b/webapp/plugins/vue-directives.js
index 43daed57e..d41f35a0e 100644
--- a/webapp/plugins/vue-directives.js
+++ b/webapp/plugins/vue-directives.js
@@ -7,12 +7,8 @@ export default ({ app }) => {
       // Focus the element
       Vue.nextTick(() => {
         if (binding.value !== false) {
-          let target = el
-          const isInput = target instanceof HTMLInputElement
-          if (!isInput) {
-            target = el.querySelector('input')
-          }
-          if (target && typeof target.focus === 'function') {
+          const target = el instanceof HTMLInputElement ? el : el.querySelector('input')
+          if (target) {
             target.focus()
           }
         }