diff --git a/css/components/search.css b/css/components/search.css
index 94d2ccc..7a9656b 100644
--- a/css/components/search.css
+++ b/css/components/search.css
@@ -7,7 +7,8 @@
 }
 
 @media (min-width: 1040px) {
-  .site-header__search:focus-within {
+  .site-header__search:focus-within,
+  .site-header__search.has-content {
     max-width: 600px;
   }
 }
diff --git a/static/mobile-menu.js b/static/mobile-menu.js
index 655ba91..c618abe 100644
--- a/static/mobile-menu.js
+++ b/static/mobile-menu.js
@@ -95,12 +95,15 @@ document.addEventListener('DOMContentLoaded', function() {
     }
   });
 
-  // Collapse search on blur (mobile only)
+  // Collapse search on blur (mobile only) - only if empty
   searchInput.addEventListener('blur', function() {
     if (isMobile()) {
       // Small delay to allow clicking search results
       setTimeout(function() {
-        headerContainer.classList.remove('search-expanded');
+        // Only remove search-expanded if the input is empty
+        if (searchInput.value.trim() === "") {
+          headerContainer.classList.remove('search-expanded');
+        }
       }, 200);
     }
   });
@@ -108,7 +111,10 @@ document.addEventListener('DOMContentLoaded', function() {
   // Re-check on window resize
   window.addEventListener('resize', function() {
     if (!isMobile()) {
-      headerContainer.classList.remove('search-expanded');
+      // Only remove if empty when switching to desktop
+      if (searchInput.value.trim() === "") {
+        headerContainer.classList.remove('search-expanded');
+      }
     }
   });
 });
diff --git a/static/search.js b/static/search.js
index f9f4ec9..ebdd808 100644
--- a/static/search.js
+++ b/static/search.js
@@ -7,10 +7,29 @@ const ESCAPE_KEY = "Escape";
 const searchInput = document.getElementById("search");
 const searchResults = document.getElementById("search-results");
 const searchResultsItems = document.getElementById("search-results__items");
+const searchContainer = document.querySelector(".site-header__search");
+const headerContainer = document.querySelector(".site-header__container");
 
 let searchItemSelected = null;
 let resultsItemsIndex = -1;
 
+// Function to update search container class based on input content
+function updateSearchContainerClass() {
+    if (searchInput && searchContainer) {
+        if (searchInput.value.trim() !== "") {
+            searchContainer.classList.add("has-content");
+            if (headerContainer) {
+                headerContainer.classList.add("search-expanded");
+            }
+        } else {
+            searchContainer.classList.remove("has-content");
+            if (headerContainer) {
+                headerContainer.classList.remove("search-expanded");
+            }
+        }
+    }
+}
+
 ////////////////////////////////////
 // Interaction with the search input
 ////////////////////////////////////
@@ -47,6 +66,7 @@ document.addEventListener("keydown", function (keyboardEvent) {
             searchInput.value = "";
             searchResults.style.display = "none";
             searchInput.blur();
+            updateSearchContainerClass();
             break;
         }
     }
@@ -122,6 +142,8 @@ if (document.readyState === "complete" || (document.readyState !== "loading" &&
 }
 
 function initSearch() {
+    updateSearchContainerClass();
+    
     elasticlunr.trimmer = function (token) {
         if (token === null || token === undefined) {
             throw new Error("token should not be undefined");
@@ -181,11 +203,15 @@ function initSearch() {
 
         searchItemSelected = null;
         resultsItemsIndex = -1;
+        updateSearchContainerClass();
         debounce(showResults(index), 150)();
     });
 
     // Hide results when user press on the "x" placed inside the search field
-    searchInput.addEventListener("search", () => searchResults.style.display = "");
+    searchInput.addEventListener("search", () => {
+        searchResults.style.display = "";
+        updateSearchContainerClass();
+    });
     searchInput.addEventListener("focusin", function () {
         if (searchInput.value !== "") {
             showResults(index)();
@@ -270,7 +296,10 @@ function createMenuItem(result, index) {
         searchItemSelected = mouseEvent.target;
         resultsItemsIndex = index;
     })
-    item.addEventListener("click", () => searchInput.value = "")
+    item.addEventListener("click", () => {
+        searchInput.value = "";
+        updateSearchContainerClass();
+    })
     searchResultsItems.appendChild(item);
 }