diff --git a/CHANGELOG-nightly.md b/CHANGELOG-nightly.md
index 16e61ae83..7c53e86db 100644
--- a/CHANGELOG-nightly.md
+++ b/CHANGELOG-nightly.md
@@ -9,6 +9,7 @@
 - Fixed a user card crash
 - Fixed an issue with the EventAPI connection closing on the first initialization
 - Fixed an issue that prevented new chatters from appearing in autocompletion
+- Fixed an issue which squished tooltips when hovering an emote on the far right side of chat
 - Increased the default value for Message Batching from 150 to 250
 
 ### Version 3.0.13.1000
diff --git a/src/app/chat/EmoteTooltip.vue b/src/app/chat/EmoteTooltip.vue
index 255ac402f..029ad513e 100644
--- a/src/app/chat/EmoteTooltip.vue
+++ b/src/app/chat/EmoteTooltip.vue
@@ -136,6 +136,7 @@ if (props.emote.data?.owner?.style?.color) {
 
 <style scoped lang="scss">
 .seventv-tooltip {
+	width: max-content;
 	display: flex;
 	flex-direction: column;
 	align-items: center;