diff --git a/src/views/search/SearchIndex.vue b/src/views/search/SearchIndex.vue
index 1daa1045..09abee38 100644
--- a/src/views/search/SearchIndex.vue
+++ b/src/views/search/SearchIndex.vue
@@ -7,47 +7,29 @@ import { searchStore } from '../../store/store.js'
 		<h2 class="pageHeader">
 			Resultaten
 		</h2>
-		<ul>
-			<NcListItem
-				v-for="(result, i) in searchStore.searchResults.results"
-				:key="`${result}${i}`"
-				:name="result.title"
-				:subname="result.summary"
-				:details="result.metaData.title"
-				:bold="false"
-				:force-display-actions="true"
-				:counter-number="result.attachment_count">
-				<template #icon>
-					<ListBoxOutline :size="44" />
-				</template>
-				<template #actions>
-					<NcActionButton @click="goToLink(result.portal)">
-						<template #icon>
-							<LinkIcon :size="20" />
-						</template>
-						Open portal page
-					</NcActionButton>
-				</template>
-			</NcListItem>
-		</ul>
+		<NcNoteCard v-if="!searchStore.searchResults?.results?.length > 0 || !searchStore.searchResults" type="info">
+			<p>Er zijn op dit moment geen publicaties die aan uw zoekopdracht voldoen</p>
+		</NcNoteCard>
+		<NcLoadingIcon v-if="!searchStore.searchResults"
+			:size="64"
+			class="loadingIcon"
+			appearance="dark"
+			name="Publicaties aan het laden" />
+		<SearchList v-if="searchStore.searchResults?.results?.length > 0" />
 	</NcAppContent>
 </template>
 
 <script>
-import { NcAppContent, NcListItem, NcActionButton } from '@nextcloud/vue'
-
-import ListBoxOutline from 'vue-material-design-icons/ListBoxOutline.vue'
-import LinkIcon from 'vue-material-design-icons/Link.vue'
+import { NcAppContent, NcNoteCard, NcLoadingIcon } from '@nextcloud/vue'
+import SearchList from './SearchList.vue'
 
 export default {
 	name: 'SearchIndex',
 	components: {
 		NcAppContent,
-		NcListItem,
-		NcActionButton,
-		// Icons
-		ListBoxOutline,
-		LinkIcon,
+		NcNoteCard,
+		NcLoadingIcon,
+		SearchList,
 	},
 	props: {
 		search: {
diff --git a/src/views/search/SearchList.vue b/src/views/search/SearchList.vue
new file mode 100644
index 00000000..282a0a1c
--- /dev/null
+++ b/src/views/search/SearchList.vue
@@ -0,0 +1,52 @@
+<script setup>
+import { searchStore } from '../../store/store.js'
+</script>
+
+<template>
+	<ul>
+		<NcListItem
+			v-for="(result, i) in searchStore.searchResults.results"
+			:key="`${result}${i}`"
+			:name="result.title || 'Geen titel'"
+			:subname="result.summary || 'Geen samenvatting'"
+			:details="result.metaData?.title || 'Geen metadata'"
+			:bold="false"
+			:force-display-actions="true"
+			:counter-number="result.attachment_count || 0">
+			<template #icon>
+				<ListBoxOutline :size="44" />
+			</template>
+			<template #actions>
+				<NcActionButton v-if="result.portal" @click="goToLink(result.portal)">
+					<template #icon>
+						<OpenInNew :size="20" />
+					</template>
+					Open portal page
+				</NcActionButton>
+			</template>
+		</NcListItem>
+	</ul>
+</template>
+<script>
+import { NcListItem, NcActionButton } from '@nextcloud/vue'
+
+// Icons
+import ListBoxOutline from 'vue-material-design-icons/ListBoxOutline.vue'
+import OpenInNew from 'vue-material-design-icons/OpenInNew.vue'
+
+export default {
+	name: 'SearchList',
+	components: {
+		NcListItem,
+		NcActionButton,
+		// Icons
+		ListBoxOutline,
+		OpenInNew,
+	},
+	methods: {
+		goToLink(link) {
+			//
+		},
+	},
+}
+</script>