diff --git a/src/pydata_sphinx_theme/assets/scripts/pydata-sphinx-theme.js b/src/pydata_sphinx_theme/assets/scripts/pydata-sphinx-theme.js
index 33b9fde0c..b71b32973 100644
--- a/src/pydata_sphinx_theme/assets/scripts/pydata-sphinx-theme.js
+++ b/src/pydata_sphinx_theme/assets/scripts/pydata-sphinx-theme.js
@@ -380,6 +380,7 @@ var setupSearchAsYouType = () => {
 
     // Don't search when there's nothing in the query textbox.
     if (query === "") {
+      lastQuery = "";
       resetSearchAsYouTypeResults(); // Remove previous results.
       return;
     }
diff --git a/src/pydata_sphinx_theme/assets/styles/components/_search.scss b/src/pydata_sphinx_theme/assets/styles/components/_search.scss
index 72a38f9d3..9ef077f80 100644
--- a/src/pydata_sphinx_theme/assets/styles/components/_search.scss
+++ b/src/pydata_sphinx_theme/assets/styles/components/_search.scss
@@ -86,10 +86,10 @@
   margin: 15vh auto 0; // an open modal dialog has a fixed position, so these margins bring it 15% down the viewport height and center it horizontally
   width: 90%;
   max-width: 800px;
+  max-height: 80vh; // when we display search-as-you-type results in the modal, it needs to be able to expand in height
   background-color: transparent;
   padding: $focus-ring-width;
   border: none;
-  height: 80vh;
 
   &::backdrop {
     background-color: black;