diff --git a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java
index 8e8980c..53d03fb 100644
--- a/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java
+++ b/prototype/src/main/java/org/hso/ecommerce/controller/shop/ShopSearchController.java
@@ -47,6 +47,9 @@ public class ShopSearchController {
             return "error/404";
         }
 
+        // Show term in search box
+        model.addAttribute("searchterm", term != null ? term : "");
+
         return "shop/search";
     }
 }
\ No newline at end of file
diff --git a/prototype/src/main/resources/templates/fragments/header.html b/prototype/src/main/resources/templates/fragments/header.html
index 349f72c..9984032 100644
--- a/prototype/src/main/resources/templates/fragments/header.html
+++ b/prototype/src/main/resources/templates/fragments/header.html
@@ -11,7 +11,8 @@
     <div class='content-width bar-flex'>
         <a class="button no-padding" href="/"><img class="logo" th:src="@{/img/ecom-logo-base.svg}"></a>
         <form class='spacer input-icon secondary' th:action="@{/shop/search}" method="GET">
-            <input type="text" name="term" placeholder="Nach Produkten suchen..."/>
+            <input type="text" name="term" placeholder="Nach Produkten suchen..."
+                   th:value="${searchterm != null ? searchterm : ''}"/>
             <button>Finden</button>
         </form>
         <a th:unless="${user}" class="button" th:href="@{/login}">Login</a>