diff --git a/client/components/ContextMenu.vue b/client/components/ContextMenu.vue
index f060bb0d..81011443 100644
--- a/client/components/ContextMenu.vue
+++ b/client/components/ContextMenu.vue
@@ -27,7 +27,7 @@
 						{active: id === activeItem},
 					]"
 					role="menuitem"
-					@mouseover="hoverItem(id)"
+					@mouseenter="hoverItem(id)"
 					@click="clickItem(item)"
 				>
 					{{ item.label }}
diff --git a/client/components/Username.vue b/client/components/Username.vue
index 80f6023f..a301da37 100644
--- a/client/components/Username.vue
+++ b/client/components/Username.vue
@@ -3,7 +3,7 @@
 		:class="['user', nickColor, {active: active}]"
 		:data-name="user.nick"
 		role="button"
-		v-on="onHover ? {mouseover: hover} : {}"
+		v-on="onHover ? {mouseenter: hover} : {}"
 		@click.prevent="openContextMenu"
 		@contextmenu.prevent="openContextMenu"
 		><slot>{{ user.mode }}{{ user.nick }}</slot></span
diff --git a/client/css/style.css b/client/css/style.css
index e88b85c0..9cf5b3ca 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -1666,6 +1666,7 @@ part/quit messages where we don't load previews (adds a blank line otherwise) */
 	font: inherit;
 	outline: 0;
 	padding: 13px;
+	padding-right: 30px;
 	width: 100%;
 }