diff --git a/core/src/components/GlobalSearch/CustomDateRangeModal.vue b/core/src/components/GlobalSearch/CustomDateRangeModal.vue
new file mode 100644
index 0000000000000..3a479cf043b1b
--- /dev/null
+++ b/core/src/components/GlobalSearch/CustomDateRangeModal.vue
@@ -0,0 +1,77 @@
+<template>
+	<NcModal v-if="isVisible"
+		id="global-search"
+		:name="t('core', 'Date range filter')"
+		:show.sync="isVisible"
+		:clear-view-delay="0"
+		:title="t('Date range filter')"
+		@close="closeModal">
+		<!-- Custom date range -->
+		<div class="global-search-custom-date-modal">
+			<h1>{{ t('core', 'Date range filter') }}</h1>
+			<div class="global-search-custom-date-modal__pickers">
+				<NcDateTimePicker />
+				<NcDateTimePicker />
+			</div>
+			<NcButton type="tertiary-no-background">
+				{{ t('core', 'Apply range') }}
+				<template #icon>
+					<CalendarRangeIcon :size="20" />
+				</template>
+			</NcButton>
+		</div>
+	</NcModal>
+</template>
+
+<script>
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcDateTimePicker from '@nextcloud/vue/dist/Components/NcDateTimePicker.js'
+import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+import CalendarRangeIcon from 'vue-material-design-icons/CalendarRange.vue'
+
+export default {
+	name: 'CustomDateRangeModal',
+	components: {
+		NcButton,
+		NcModal,
+		CalendarRangeIcon,
+		NcDateTimePicker,
+	},
+	props: {
+		isVisible: {
+			type: Boolean,
+			required: true,
+		},
+	},
+	data() {
+		return {
+
+		}
+	},
+	mounted() {
+	},
+	methods: {
+		closeModal() {
+			// close operations like clean search?
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.global-search-custom-date-modal {
+	padding: 10px 20px 10px 20px;
+
+	h1 {
+		font-size: 16px;
+		font-weight: bolder;
+		line-height: 2em;
+	}
+
+	&__pickers {
+		display: flex;
+		flex-direction: column;
+	}
+
+}
+</style>
diff --git a/core/src/components/GlobalSearch/SearchFilterChip.vue b/core/src/components/GlobalSearch/SearchFilterChip.vue
new file mode 100644
index 0000000000000..4353234f77124
--- /dev/null
+++ b/core/src/components/GlobalSearch/SearchFilterChip.vue
@@ -0,0 +1,72 @@
+<template>
+	<div class="chip">
+		<span class="icon">
+			<slot name="icon" />
+			<span v-if="pretext.length"> {{ pretext }} : </span>
+		</span>
+		<span class="text">{{ text }}</span>
+		<span class="close-icon" @click="deleteChip">
+			<CloseIcon :size="16" />
+		</span>
+	</div>
+</template>
+
+<script>
+import CloseIcon from 'vue-material-design-icons/CloseThick.vue'
+
+export default {
+	name: 'SearchFilterChip',
+	components: {
+		CloseIcon,
+	},
+	props: {
+		text: String,
+		pretext: String,
+	},
+	methods: {
+		deleteChip() {
+			this.$emit('delete', this.filter)
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.chip {
+    display: flex;
+    align-items: center;
+    padding: 2px 4px;
+    border: 1px solid var(--color-primary-element-light);
+    border-radius: 20px;
+    background-color: var(--color-primary-element-light);
+    margin: 2px;
+    font-size: 10px;
+    font-weight: bolder;
+
+    .icon {
+        display: flex;
+        align-items: center;
+        padding-right: 5px;
+
+        img {
+            width: 20px;
+            padding: 2px;
+            background-color: var(--color-primary-element);
+            border-radius: 20px;
+        }
+    }
+
+    .text {
+        margin: 0 2px;
+    }
+
+    .close-icon {
+        cursor: pointer;
+
+        :hover {
+            border-radius: 4px;
+            padding: 1px;
+        }
+    }
+}
+</style>
diff --git a/core/src/global-search.js b/core/src/global-search.js
new file mode 100644
index 0000000000000..f0c47fa189501
--- /dev/null
+++ b/core/src/global-search.js
@@ -0,0 +1,55 @@
+/**
+ * @copyright Copyright (c) 2020 Fon E. Noel NFEBE <fenn25.fn@gmail.com>
+ *
+ * @author Fon E. Noel NFEBE <fenn25.fn@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { getLoggerBuilder } from '@nextcloud/logger'
+import { getRequestToken } from '@nextcloud/auth'
+import { translate as t, translatePlural as n } from '@nextcloud/l10n'
+import Vue from 'vue'
+
+import GlobalSearch from './views/GlobalSearch.vue'
+
+// eslint-disable-next-line camelcase
+__webpack_nonce__ = btoa(getRequestToken())
+
+const logger = getLoggerBuilder()
+	.setApp('global-search')
+	.detectUser()
+	.build()
+
+Vue.mixin({
+	data() {
+		return {
+			logger,
+		}
+	},
+	methods: {
+		t,
+		n,
+	},
+})
+
+export default new Vue({
+	el: '#global-search',
+	// eslint-disable-next-line vue/match-component-file-name
+	name: 'GlobalSearchRoot',
+	render: h => h(GlobalSearch),
+})
diff --git a/core/src/services/GlobalSearchService.js b/core/src/services/GlobalSearchService.js
new file mode 100644
index 0000000000000..6db3b0a3a59fa
--- /dev/null
+++ b/core/src/services/GlobalSearchService.js
@@ -0,0 +1,93 @@
+/**
+ * @copyright 2023, Fon E. Noel NFEBE <fenn25.fn@gmail.com>
+ *
+ * @author Fon E. Noel NFEBE <fenn25.fn@gmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+import { generateOcsUrl } from '@nextcloud/router'
+import { loadState } from '@nextcloud/initial-state'
+import axios from '@nextcloud/axios'
+
+export const defaultLimit = loadState('unified-search', 'limit-default')
+export const minSearchLength = loadState('unified-search', 'min-search-length', 1)
+export const enableLiveSearch = loadState('unified-search', 'live-search', true)
+
+export const regexFilterIn = /(^|\s)in:([a-z_-]+)/ig
+export const regexFilterNot = /(^|\s)-in:([a-z_-]+)/ig
+
+/**
+ * Create a cancel token
+ *
+ * @return {import('axios').CancelTokenSource}
+ */
+const createCancelToken = () => axios.CancelToken.source()
+
+/**
+ * Get the list of available search providers
+ *
+ * @return {Promise<Array>}
+ */
+export async function getProviders() {
+	try {
+		const { data } = await axios.get(generateOcsUrl('search/providers'), {
+			params: {
+				// Sending which location we're currently at
+				from: window.location.pathname.replace('/index.php', '') + window.location.search,
+			},
+		})
+		if ('ocs' in data && 'data' in data.ocs && Array.isArray(data.ocs.data) && data.ocs.data.length > 0) {
+			// Providers are sorted by the api based on their order key
+			return data.ocs.data
+		}
+	} catch (error) {
+		console.error(error)
+	}
+	return []
+}
+
+/**
+ * Get the list of available search providers
+ *
+ * @param {object} options destructuring object
+ * @param {string} options.type the type to search
+ * @param {string} options.query the search
+ * @param {number|string|undefined} options.cursor the offset for paginated searches
+ * @return {object} {request: Promise, cancel: Promise}
+ */
+export function search({ type, query, cursor }) {
+	/**
+	 * Generate an axios cancel token
+	 */
+	const cancelToken = createCancelToken()
+
+	const request = async () => axios.get(generateOcsUrl('search/providers/{type}/search', { type }), {
+		cancelToken: cancelToken.token,
+		params: {
+			term: query,
+			cursor,
+			// Sending which location we're currently at
+			from: window.location.pathname.replace('/index.php', '') + window.location.search,
+		},
+	})
+
+	return {
+		request,
+		cancel: cancelToken.cancel,
+	}
+}
diff --git a/core/src/views/GlobalSearch.vue b/core/src/views/GlobalSearch.vue
new file mode 100644
index 0000000000000..3d5846c66da93
--- /dev/null
+++ b/core/src/views/GlobalSearch.vue
@@ -0,0 +1,61 @@
+ <!--
+  - @copyright Copyright (c) 2020 Fon E. Noel NFEBE <fenn25.fn@gmail.com>
+  -
+  - @author Fon E. Noel NFEBE <fenn25.fn@gmail.com>
+  -
+  - @license GNU AGPL version 3 or any later version
+  -
+  - This program is free software: you can redistribute it and/or modify
+  - it under the terms of the GNU Affero General Public License as
+  - published by the Free Software Foundation, either version 3 of the
+  - License, or (at your option) any later version.
+  -
+  - This program is distributed in the hope that it will be useful,
+  - but WITHOUT ANY WARRANTY; without even the implied warranty of
+  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  - GNU Affero General Public License for more details.
+  -
+  - You should have received a copy of the GNU Affero General Public License
+  - along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  -
+  -->
+<template>
+    <div>
+        <NcButton aria-label="Global search" @click="toggleGlobalSearch">
+            <template #icon>
+                <Magnify class="unified-search__trigger" :size="22" />
+            </template>
+        </NcButton>
+        <GlobalSearchModal :isVisible="showGlobalSearch" />
+    </div>
+</template>
+
+<script>
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import Magnify from 'vue-material-design-icons/Magnify.vue'
+import GlobalSearchModal from './GlobalSearchModal.vue';
+
+export default {
+    name: 'GlobalSearch',
+    components: {
+        NcButton,
+        Magnify,
+        GlobalSearchModal,
+    },
+    data() {
+        return {
+            showGlobalSearch: false,
+        };
+    },
+    mounted() {
+        console.debug("Global search initialized!")
+    },
+    methods: {
+        toggleGlobalSearch() {
+            this.showGlobalSearch = !this.showGlobalSearch
+        }
+    }
+};
+</script>
+  
+<style lang="scss" scoped></style>
diff --git a/core/src/views/GlobalSearchModal.vue b/core/src/views/GlobalSearchModal.vue
new file mode 100644
index 0000000000000..db5238cd43fcc
--- /dev/null
+++ b/core/src/views/GlobalSearchModal.vue
@@ -0,0 +1,399 @@
+<template>
+	<NcModal v-if="isVisible"
+		id="global-search"
+		:name="t('core', 'Global search')"
+		:show.sync="isVisible"
+		:clear-view-delay="0"
+		:title="t('Global search')"
+		@close="closeModal">
+		<CustomDateRangeModal :is-visible="showDateRangeModal" />
+		<!-- Global search form -->
+		<div ref="globalSearch" class="global-search-modal">
+			<h1>{{ t('core', 'Global search') }}</h1>
+			<NcInputField :value.sync="searchQuery"
+				type="text"
+				:label="t('core', 'Search apps, files, tags, messages...')"
+				@update:value="debouncedFind" />
+			<div class="global-search-modal__filters">
+				<NcActions :menu-name="t('core', 'Apps and Settings')" :open="false">
+					<template #icon>
+						<ArrowDown :size="20" />
+					</template>
+					<NcActionButton v-for="provider in providers" :key="provider.id" @click="addProviderFilter(provider)">
+						<template #icon>
+							<img :src="provider.icon">
+						</template>
+						{{ t('core', provider.name) }}
+					</NcActionButton>
+				</NcActions>
+				<NcActions :menu-name="t('core', 'Modified')">
+					<template #icon>
+						<CalendarRangeIcon :size="20" />
+					</template>
+					<NcActionButton>{{ t('core', 'Today') }}</NcActionButton>
+					<NcActionButton>{{ t('core', 'Last 7 days') }}</NcActionButton>
+					<NcActionButton>{{ t('core', 'Last 30 days') }}</NcActionButton>
+					<NcActionButton>{{ t('core', 'This year') }}</NcActionButton>
+					<NcActionButton>{{ t('core', 'Last year') }}</NcActionButton>
+					<NcActionButton @click="setCustomDateRange">
+						{{ t('core', 'Custom date range') }}
+					</NcActionButton>
+				</NcActions>
+				<NcSelect v-bind="peopleSeclectProps" v-model="peopleSeclectProps.value" />
+			</div>
+			<div class="global-search-modal__filters-applied">
+				<FilterChip v-for="filter in filters"
+					:key="filter.id"
+					:text="filter.name"
+					:pretext="''"
+					@delete="removeFilter(filter)">
+					<template #icon>
+						<AccountIcon v-if="filter.type === 'person'" />
+						<img v-else :src="filter.icon" alt="">
+					</template>
+				</FilterChip>
+			</div>
+			<div v-if="searchQuery.length === 0">
+				<NcEmptyContent :name="t('core', 'Start typing in search')">
+					<template #icon>
+						<MagnifyIcon />
+					</template>
+				</NcEmptyContent>
+			</div>
+			<div v-for="providerResult in results" :key="providerResult.id" class="global-search-modal__results">
+				<div class="result">
+					<div class="result-title">
+						<span>{{ providerResult.provider }}</span>
+					</div>
+					<ul class="result-items">
+						<NcListItem v-for="(result, index) in providerResult.results"
+							:key="index"
+							:name="result.title"
+							:bold="false">
+							<template #icon>
+								<img :src="result.thumbnailUrl">
+								<!-- <NcAvatar :size="44" user="janedoe" display-name="Jane Doe" /> -->
+								<!-- <FolderIcon v-if="providerResult.provider === 'Files'" :size="40" /> -->
+								<!-- <AccountIcon v-else :size="40" /> -->
+							</template>
+							<template #subname>
+								{{ result.subline }}
+							</template>ddd
+						</NcListItem>
+					</ul>
+					<div class="result-footer">
+						<NcButton type="tertiary-no-background">
+							Load more results
+							<template #icon>
+								<DotsHorizontalIcon :size="20" />
+							</template>
+						</NcButton>
+						<NcButton alignment="end-reverse" type="tertiary-no-background">
+							Search in {{ providerResult.provider }}
+							<template #icon>
+								<ArrowRight :size="20" />
+							</template>
+						</NcButton>
+					</div>
+				</div>
+			</div>
+		</div>
+	</NcModal>
+</template>
+
+<script>
+import ArrowRight from 'vue-material-design-icons/ArrowRight.vue'
+import ArrowDown from 'vue-material-design-icons/ArrowDown.vue'
+import AccountIcon from 'vue-material-design-icons/AccountCircle.vue'
+import CalendarRangeIcon from 'vue-material-design-icons/CalendarRange.vue'
+import CustomDateRangeModal from '../components/GlobalSearch/CustomDateRangeModal.vue'
+import DotsHorizontalIcon from 'vue-material-design-icons/DotsHorizontal.vue'
+import FilterChip from '../components/GlobalSearch/SearchFilterChip.vue'
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
+import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
+import NcInputField from '@nextcloud/vue/dist/Components/NcInputField.js'
+import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
+import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
+import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+import MagnifyIcon from 'vue-material-design-icons/Magnify.vue'
+
+import debounce from 'debounce'
+import { getProviders, search as globalSearch } from '../services/GlobalSearchService.js'
+
+export default {
+	name: 'GlobalSearchModal',
+	components: {
+		AccountIcon,
+		ArrowRight,
+		ArrowDown,
+		CalendarRangeIcon,
+		CustomDateRangeModal,
+		DotsHorizontalIcon,
+		FilterChip,
+		NcActions,
+		NcActionButton,
+		NcButton,
+		NcEmptyContent,
+		NcModal,
+		NcListItem,
+		NcSelect,
+		NcInputField,
+		MagnifyIcon,
+	},
+	props: {
+		isVisible: {
+			type: Boolean,
+			required: true,
+		},
+	},
+	data() {
+		return {
+			providers: [],
+			providerActionMenuIsOpen: false,
+			filteredProviders: [],
+			searchQuery: '',
+			placesFilter: '',
+			dateTimeFilter: null,
+			filters: [],
+			results: [],
+			debouncedFind: debounce(this.find, 300),
+			showDateRangeModal: false,
+		}
+	},
+
+	computed: {
+		peopleSeclectProps: {
+			get() {
+				return {
+					// inputId: getRandomId(),
+					name: 'People',
+					userSelect: true,
+					placement: 'top',
+					options: this.getUsers(),
+				}
+			},
+
+		},
+
+	},
+	mounted() {
+		// Try to add a custom class to modal so, we can set localized styles that does
+		// not affect every modal
+		// this.$nextTick(() => {
+		// 	const searchModal = this.$refs.globalSearch.closest('.modal-container');
+		// 	if (searchModal) {
+		// 		searchModal.classList.add('global-search');
+		// 	}
+		// });
+		getProviders().then((providers) => {
+			this.providers = providers
+			console.debug('Search providers', this.providers)
+		})
+	},
+	methods: {
+		find(query) {
+			if (query.length) {
+				const newResults = []
+				let activeSearchProviders = []
+				if (this.filteredProviders.length > 0) {
+					activeSearchProviders = this.filteredProviders
+				} else {
+					activeSearchProviders = this.providers
+				}
+				activeSearchProviders.forEach(provider => {
+					console.debug('Search type', provider.id)
+					const request = globalSearch({ type: provider.id, query, cursor: null }).request
+					request().then((response) => {
+						newResults.push({ id: provider.id, provider: provider.name, results: response.data.ocs.data.entries })
+						console.debug('New results', newResults)
+						console.debug('Global search results:', newResults)
+						this.updateResults(newResults)
+					})
+				})
+			} else {
+				this.results = []
+			}
+		},
+		setCustomDateRange() {
+			this.showDateRangeModal = true
+		},
+		updateResults(newResults) {
+			newResults.forEach(newResult => {
+				const existingResultIndex = this.results.findIndex(result => result.id === newResult.id)
+				if (existingResultIndex !== -1) {
+					// If the result with the same ID exists, check the new results array
+					if (newResult.results.length === 0) {
+						// If the new results array is empty, remove the existing result
+						this.results.splice(existingResultIndex, 1)
+					} else {
+						// Otherwise, replace the existing result with the new result
+						this.results.splice(existingResultIndex, 1, newResult)
+					}
+				} else if (newResult.results.length > 0) {
+					// If not, push the new result to the array only if its results array is not empty
+					this.results.push(newResult)
+				}
+			})
+		},
+		closeModal() {
+			// close operations like clean search?
+		},
+		addProviderFilter(providerFilter) {
+			if (!providerFilter.id) return
+			this.providerActionMenuIsOpen = false
+			const existingFilter = this.filteredProviders.find(existing => existing.id === providerFilter.id)
+			if (!existingFilter) {
+				this.filteredProviders.push({ id: providerFilter.id, name: providerFilter.name, icon: providerFilter.icon, type: 'provider' })
+			}
+			this.filters = this.syncProviderFilters(this.filters, this.filteredProviders)
+			console.debug('Search filters (newly added)', this.filters)
+
+		},
+		removeFilter(filter) {
+			if (filter.type === 'provider') {
+				for (let i = 0; i < this.filteredProviders.length; i++) {
+					if (this.filteredProviders[i].id === filter.id) {
+						this.filteredProviders.splice(i, 1)
+						break
+					}
+				}
+				this.filters = this.syncProviderFilters(this.filters, this.filteredProviders)
+				console.debug('Search filters (recently removed)', this.filters)
+
+			}
+		},
+		syncProviderFilters(firstArray, secondArray) {
+			// Create a copy of the first array to avoid modifying it directly.
+			const synchronizedArray = firstArray.slice()
+
+			// Remove items from the synchronizedArray that are not in the secondArray.
+			synchronizedArray.forEach((item, index) => {
+				const itemId = item.id // Replace 'id' with the actual property name you're checking.
+				if (!secondArray.some(secondItem => (secondItem.id === itemId && secondItem.type === 'provider'))) {
+					synchronizedArray.splice(index, 1)
+				}
+			})
+
+			// Add items to the synchronizedArray that are in the secondArray but not in the firstArray.
+			secondArray.forEach(secondItem => {
+				const itemId = secondItem.id // Replace 'id' with the actual property name you're checking.
+				if (!synchronizedArray.some(item => (item.id === itemId && item.type === 'provider'))) {
+					synchronizedArray.push(secondItem)
+				}
+			})
+
+			return synchronizedArray
+		},
+		getUsers() {
+			return [
+				'Peterson Kim',
+				'Jonatam Mbongham',
+				'Jonh kunerwater',
+				'Bandolo Ambe',
+				'Nformi Shey',
+			]
+		},
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+::v-deep .modal-container {
+	height: 80%;
+}
+
+.global-search-modal {
+	padding: 10px 20px 10px 20px;
+	height: 60%;
+
+	h1 {
+		font-size: 16px;
+		font-weight: bolder;
+		line-height: 2em;
+	}
+
+	&__filters {
+		display: flex;
+		padding-top: 5px;
+		align-items: center;
+		justify-content: space-between;
+
+		/* Overwrite NcSelect styles */
+		::v-deep div.v-select {
+			min-width: 0; // reset NcSelect min width
+
+			div.vs__dropdown-toggle {
+				height: 44px; // Overwrite height of NcSelect component to match button
+			}
+		}
+
+		::v-deep>* {
+			min-width: auto;
+			/* Reset hard set min widths */
+			min-height: 0;
+			/* Reset any min heights */
+			display: flex;
+			align-items: center;
+			flex: 1;
+
+			>* {
+				flex: 1;
+				min-width: auto;
+				/* Reset hard set min widths */
+				min-height: 0;
+			}
+
+		}
+
+		::v-deep>*:not(:last-child) {
+			margin: 0 2px;
+		}
+	}
+
+	&__filters-applied {
+		display: flex;
+		flex-wrap: wrap;
+	}
+
+	&__results {
+		padding: 10px;
+
+		.result {
+
+			.result-title {
+				span {
+					color: var(--color-primary-element);
+					font-weight: bolder;
+					font-size: 16px;
+				}
+			}
+
+			.result-footer {
+				justify-content: space-between;
+				align-items: center;
+				display: flex;
+			}
+		}
+
+	}
+}
+
+div.v-popper__wrapper {
+	ul {
+		li {
+			::v-deep button.action-button {
+				align-items: center !important;
+
+				img {
+					width: 24px;
+					margin: 0 4px;
+					background-color: var(--color-primary-element);
+					border-radius: 5px;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 9c23930f32491..9e04fed196f27 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -68,6 +68,7 @@
 			</div>
 
 			<div class="header-right">
+			    <div id="global-search"></div>
 				<div id="unified-search"></div>
 				<div id="notifications"></div>
 				<div id="contactsmenu"></div>
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index e2504363257ee..90ca935974074 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -110,6 +110,7 @@ public function __construct($renderAs, $appId = '') {
 			$this->initialState->provideInitialState('unified-search', 'min-search-length', (int)$this->config->getAppValue('core', 'unified-search.min-search-length', (string)1));
 			$this->initialState->provideInitialState('unified-search', 'live-search', $this->config->getAppValue('core', 'unified-search.live-search', 'yes') === 'yes');
 			Util::addScript('core', 'unified-search', 'core');
+			Util::addScript('core', 'global-search', 'core');
 
 			// Set body data-theme
 			$this->assign('enabledThemes', []);
diff --git a/webpack.modules.js b/webpack.modules.js
index 67be70c5fed64..b380a8385ed0b 100644
--- a/webpack.modules.js
+++ b/webpack.modules.js
@@ -38,6 +38,7 @@ module.exports = {
 		profile: path.join(__dirname, 'core/src', 'profile.js'),
 		recommendedapps: path.join(__dirname, 'core/src', 'recommendedapps.js'),
 		systemtags: path.resolve(__dirname, 'core/src', 'systemtags/merged-systemtags.js'),
+		'global-search': path.join(__dirname, 'core/src', 'global-search.js'),
 		'unified-search': path.join(__dirname, 'core/src', 'unified-search.js'),
 		'unsupported-browser': path.join(__dirname, 'core/src', 'unsupported-browser.js'),
 		'unsupported-browser-redirect': path.join(__dirname, 'core/src', 'unsupported-browser-redirect.js'),