diff --git a/resource/css/skosmos.css b/resource/css/skosmos.css
index 0ec52e8e2..4e2ed091c 100644
--- a/resource/css/skosmos.css
+++ b/resource/css/skosmos.css
@@ -20,6 +20,7 @@
   --sidebar-scrollbar-bg: var(--light-color);
   --sidebar-scrollbar-thumb: var(--secondary-medium-color);
   --search-bg: var(--white-color);
+  --search-dropdown-bg: var(--light-color);
   --search-border: var(--medium-color);
   --search-button-bg: var(--dark-color);
   --search-button-text: var(--white-color);
@@ -271,7 +272,7 @@ body {
 
   #search-wrapper .dropdown-menu {
     transform: translateY(-1px);
-    background-color: var(--search-bg);
+    background-color: var(--search-dropdown-bg);
     color: var(--headerbar-text-2);
     border: 1px solid var(--search-border);
     border-radius: 0;
@@ -280,6 +281,8 @@ body {
   #search-wrapper ul {
     padding-top: 0rem;
     padding-bottom: 0rem;
+    max-height: 50vh;
+    overflow-y: auto;
   }
 
   #search-wrapper .autocomplete {
diff --git a/resource/js/vocab-search.js b/resource/js/vocab-search.js
index e7e6b6528..a26ba610c 100644
--- a/resource/js/vocab-search.js
+++ b/resource/js/vocab-search.js
@@ -264,8 +264,10 @@ const vocabSearch = Vue.createApp({
             @input="autoComplete()"
             @keyup.enter="gotoSearchPage()"
             @click="showAutoComplete()">
-          <ul id="search-autocomplete-results" class="dropdown-menu" :class="{ 'show': showDropdown }"
-            aria-labelledby="search-field">
+          <ul id="search-autocomplete-results"
+              class="dropdown-menu w-100"
+              :class="{ 'show': showDropdown }"
+              aria-labelledby="search-field">
             <li class="autocomplete-result container" v-for="result in renderedResultsList"
               :key="result.prefLabel" >
               <template v-if="result.pageUrl">
@@ -273,7 +275,7 @@ const vocabSearch = Vue.createApp({
                   <div class="row pb-1">
                     <div class="col" v-if="result.hitType == 'hidden'">
                       <span class="result">
-                        <template v-if="result.showNotation">
+                        <template v-if="result.showNotation && result.notation">
                           {{ result.notation }}&nbsp;
                         </template>
                         <template v-if="result.hit.hasOwnProperty('match')">
@@ -287,7 +289,7 @@ const vocabSearch = Vue.createApp({
                     <div class="col" v-else-if="result.hitType == 'alt'">
                       <span>
                         <i>
-                          <template v-if="result.showNotation">
+                          <template v-if="result.showNotation && result.notation">
                             {{ result.notation }}&nbsp;
                           </template>
                           <template v-if="result.hit.hasOwnProperty('match')">
@@ -299,7 +301,7 @@ const vocabSearch = Vue.createApp({
                         </i>
                       </span>
                       <span> &rarr;&nbsp;<span class="result">
-                          <template v-if="result.showNotation">
+                          <template v-if="result.showNotation && result.notation">
                             {{ result.notation }}&nbsp;
                           </template>
                           <template v-if="result.hitPref.hasOwnProperty('match')">
@@ -321,12 +323,12 @@ const vocabSearch = Vue.createApp({
                         </template>
                       </span>
                       <span>
-                        &nbsp;{{ result.prefLabel }}
+                        {{ result.prefLabel }}
                       </span>
                     </div>
                     <div class="col" v-else-if="result.hitType == 'pref'">
                       <span class="result">
-                        <template v-if="result.showNotation">
+                        <template v-if="result.showNotation && result.notation">
                           {{ result.notation }}&nbsp;
                         </template>
                         <template v-if="result.hit.hasOwnProperty('match')">
diff --git a/tests/cypress/template/vocab-search-bar.cy.js b/tests/cypress/template/vocab-search-bar.cy.js
index f7a5c8d8d..9a17715e2 100644
--- a/tests/cypress/template/vocab-search-bar.cy.js
+++ b/tests/cypress/template/vocab-search-bar.cy.js
@@ -194,6 +194,21 @@ describe('Vocab search bar', () => {
         cy.get('li').last().find('b').eq(0).should('have.text', '51')
       })
     })
+      it('Long autocomplete result list should have a scroll bar', () => {
+        // go to YSO vocab front page
+        cy.visit('/yso/fi/')
+
+        // resize the window to smaller size
+        cy.viewport(1200, 600)
+
+        // type a search term and wait for the autocomplete to appear
+        cy.get('#search-field').type('mu')
+        cy.get('#search-autocomplete-results').should('be.visible')
+
+        // the result list should have a CSS-based scroll
+        cy.get('#search-autocomplete-results').should('have.css', 'overflow-y', 'auto')
+        cy.get('#search-autocomplete-results').should('have.css', 'max-height', '300px')
+      });
   });
 
   describe('Cookie Management', () => {