diff --git a/src/js/login.js b/src/js/login.js
index a7457da..216b12d 100644
--- a/src/js/login.js
+++ b/src/js/login.js
@@ -54,12 +54,12 @@ class Homeserver extends ElemJS {
 	constructor() {
 		super(q("#homeserver"));
 
-		this.tippy = tippy.default(q("#homeserver-question"), {
+		this.tippy = tippy.default(q(".homeserver-question"), {
 			content: q("#homeserver-popup-template").innerHTML,
 			allowHTML: true,
 			interactive: true,
 			interactiveBorder: 10,
-			trigger: "mouseenter",
+			trigger: "focus mouseenter",
 			theme: "carbon",
 			arrow: tippy.roundArrow,
 		})
diff --git a/src/login.pug b/src/login.pug
index e8408eb..918e157 100644
--- a/src/login.pug
+++ b/src/login.pug
@@ -24,7 +24,7 @@ html
             .form-input-container
               .homeserver-label
                 label(for="homeserver") Homeserver
-                span#homeserver-question (What's this?)
+                span.homeserver-question(tabindex=0) (What's this?)
               input(type="text" name="homeserver" placeholder="matrix.org")#homeserver
 
           #feedback
diff --git a/src/sass/login.sass b/src/sass/login.sass
index d9d57cc..d8385dd 100644
--- a/src/sass/login.sass
+++ b/src/sass/login.sass
@@ -44,9 +44,8 @@
 .form-error
   color: red
 
-#homeserver-question
-  font-size: 0.6em
-  padding-left: 0.2em
+.homeserver-question
+  font-size: 0.8em
 
 .homeserver-label
   display: flex
diff --git a/src/sass/tippy.sass b/src/sass/tippy.sass
index f2643f3..bc97399 100644
--- a/src/sass/tippy.sass
+++ b/src/sass/tippy.sass
@@ -3,7 +3,8 @@
 @use "./colors.sass" as c
 
 .tippy-box[data-theme~="carbon"] 
-	background-color: c.$milder
-	border: 2px solid c.$divider 
-	.tippy-svg-arrow 
-		fill: c.$milder
+  background-color: c.$milder
+  border: 2px solid c.$divider 
+
+  .tippy-svg-arrow
+    fill: c.$milder