diff --git a/src/components/RightSidebar/RightSidebar.vue b/src/components/RightSidebar/RightSidebar.vue
index 33a96fb1ac0..e608572deb5 100644
--- a/src/components/RightSidebar/RightSidebar.vue
+++ b/src/components/RightSidebar/RightSidebar.vue
@@ -538,6 +538,11 @@ export default {
 		},
 
 		handleUpdateActive(active) {
+			if (active === 'search') {
+				// 'search' is not a real tab: route it to the search content state
+				this.handleUpdateState('search')
+				return
+			}
 			this.activeTab = active
 		},
 
diff --git a/src/components/TopBar/TopBar.vue b/src/components/TopBar/TopBar.vue
index a6f8540728a..f08a1010412 100644
--- a/src/components/TopBar/TopBar.vue
+++ b/src/components/TopBar/TopBar.vue
@@ -127,6 +127,18 @@
 			<!-- Upcoming meetings -->
 			<CalendarEventsDialog v-if="showCalendarEvents" :token="token" />
 
+			<!-- Search messages button -->
+			<NcButton
+				v-if="!isInCall && !isSidebar && getUserId"
+				:title="t('spreed', 'Search messages')"
+				:aria-label="t('spreed', 'Search messages')"
+				variant="tertiary"
+				@click="openSidebar('search')">
+				<template #icon>
+					<IconMagnify :size="20" />
+				</template>
+			</NcButton>
+
 			<CallButton v-if="!isInCall" shrinkOnMobile />
 
 			<!-- TopBar menu -->
@@ -156,6 +168,7 @@ import IconAccountMultiplePlusOutline from 'vue-material-design-icons/AccountMul
 import IconArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
 import IconChevronRight from 'vue-material-design-icons/ChevronRight.vue'
 import IconClockOutline from 'vue-material-design-icons/ClockOutline.vue'
+import IconMagnify from 'vue-material-design-icons/Magnify.vue'
 import BreakoutRoomsEditor from '../BreakoutRoomsEditor/BreakoutRoomsEditor.vue'
 import CalendarEventsDialog from '../CalendarEventsDialog.vue'
 import ConversationIcon from '../ConversationIcon.vue'
@@ -201,6 +214,7 @@ export default {
 		IconArrowLeft,
 		IconChevronRight,
 		IconClockOutline,
+		IconMagnify,
 	},
 
 	props: {