diff --git a/apps/frontend/src/layouts/default.vue b/apps/frontend/src/layouts/default.vue
index efbd1d4303..f6407cf323 100644
--- a/apps/frontend/src/layouts/default.vue
+++ b/apps/frontend/src/layouts/default.vue
@@ -741,7 +741,7 @@
 					</template>
 					<template v-else>
 						<SearchIcon aria-hidden="true" class="smaller" />
-						{{ formatMessage(navMenuMessages.search) }}
+						<span>{{ formatMessage(navMenuMessages.search) }}</span>
 					</template>
 				</Button>
 				<template v-if="auth.user">
diff --git a/packages/ui/src/components/base/EmptyState.vue b/packages/ui/src/components/base/EmptyState.vue
index caa00eb11f..38b3e59837 100644
--- a/packages/ui/src/components/base/EmptyState.vue
+++ b/packages/ui/src/components/base/EmptyState.vue
@@ -1,7 +1,7 @@
 <template>
-	<div class="mx-auto flex flex-col items-center p-6 text-center">
+	<div class="mx-auto flex max-w-full flex-col items-center p-6 text-center">
 		<slot name="illustration">
-			<component :is="illustration" v-if="illustration" class="h-[200px] w-auto" />
+			<component :is="illustration" v-if="illustration" class="h-[200px] w-auto max-w-full" />
 		</slot>
 		<div class="flex flex-col items-center gap-1.5">
 			<span class="text-2xl font-semibold text-contrast">