diff --git a/src/.vuepress/components/SearchPage.vue b/src/.vuepress/components/SearchPage.vue
index ef232a0d6babb2656a0ef5aa27f5d5a1b4fe558a..87b0213ab955a7c84c554273ac5718e016d62a88 100644
--- a/src/.vuepress/components/SearchPage.vue
+++ b/src/.vuepress/components/SearchPage.vue
@@ -2,9 +2,8 @@
   <div>
     <SearchInput @search="onSearch" />
 
-    <!-- TODO: check if any search results and show only one of the following two components -->
-    <SearchResultList :items="items"/>
-    <SearchResultEmpty/>
+    <SearchResultList v-if="items.length > 0" :items="items"/>
+    <SearchResultEmpty v-else />
   </div>
 </template>
 
diff --git a/src/.vuepress/components/SearchResultList.vue b/src/.vuepress/components/SearchResultList.vue
index 8649576f818dd409e96c922b61a37f1c9c640b45..2abd1ff8fdf6b45a692fc1a28a1a75846689ab69 100644
--- a/src/.vuepress/components/SearchResultList.vue
+++ b/src/.vuepress/components/SearchResultList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="result-container">
     <v-list
       two-line
       subheader
@@ -48,4 +48,8 @@ export default {
 a {
   text-decoration: none;
 }
+
+.result-container {
+  min-height: 200px;
+}
 </style>
diff --git a/src/search.md b/src/search.md
index 485ef7e4fcc17170ebd46561f3bdc22102b7b2fb..8a6e5320ce985f494a44c7c905ec0ae665bc4545 100644
--- a/src/search.md
+++ b/src/search.md
@@ -7,4 +7,5 @@ layout: Layout
 # {{ $frontmatter.title }}{.text-h1 .mt-4 .mb-6 .font-weight-light .primary--text}
 
 Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. Lorem ipsum dolor sit amut. {.body-2}
+
 <SearchPage/>