diff --git a/src/components/SearchMessages.vue b/src/components/SearchMessages.vue
index 3c1885c7fc..8e5a66383d 100644
--- a/src/components/SearchMessages.vue
+++ b/src/components/SearchMessages.vue
@@ -10,7 +10,8 @@
 				class="search-messages--input"
 				:placeholder="t('mail', 'Search in mailbox')"
 				:aria-label="t('mail', 'Search in mailbox')"
-				@click="toggleButtons">
+				@focus="showButtons = true"
+				@blur="hideButtonsWithDelay">
 			<NcButton type="tertiary" class="search-messages--filter" @click="moreSearchActions = true">
 				<template #icon>
 					<FilterVariantIcon :size="20" />
@@ -262,6 +263,7 @@
 			<NcButton type="secondary"
 				class="shortcut"
 				:aria-label="t('mail', 'Has attachment')"
+				:title="t('mail', 'Has attachment')"
 				:pressed="hasAttachmentActive"
 				@update:pressed="hasAttachmentActive = !hasAttachmentActive"
 				@click="toggleGetAttachments">
@@ -271,6 +273,7 @@
 				class="shortcut"
 				:pressed="hasLast7daysActive"
 				:aria-label="t('mail', 'Last 7 days')"
+				:title="t('mail', 'Last 7 days')"
 				@update:pressed="hasLast7daysActive = !hasLast7daysActive"
 				@click="toggleLastWeekFilter">
 				{{ t('mail', 'Last 7 days') }}
@@ -279,6 +282,7 @@
 				class="shortcut"
 				:pressed="hasFromMeActive"
 				:aria-label="t('mail', 'From me')"
+				:title="t('mail', 'From me')"
 				@update:pressed="hasFromMeActive = !hasFromMeActive"
 				@click="toggleCurrentUser">
 				{{ t('mail', 'From me') }}
@@ -448,8 +452,10 @@ export default {
 		},
 	},
 	methods: {
-		toggleButtons() {
-			this.showButtons = !this.showButtons
+		hideButtonsWithDelay() {
+			setTimeout(() => {
+				this.showButtons = false
+			}, 100)
 		},
 		toggleGetAttachments() {
 			if (this.hasAttachmentActive) {
@@ -772,7 +778,10 @@ export default {
 	display: flex;
 	justify-content: center;
 	align-items: center;
-	flex-wrap: wrap;
+	flex-wrap: nowrap;
 	gap: 4px;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	padding: 0 5px 5px 5px;
 }
 </style>