diff --git a/app.py b/app.py
index 5ae36d6..8061551 100644
--- a/app.py
+++ b/app.py
@@ -145,14 +145,22 @@ def search_page():
     username = request.args.get("username", "guest")
     if not keywords:
         return render_template(
-            "search.html", results=[], username=username, error="Keywords are required"
+            "search.html",
+            keywords=keywords,
+            results=[],
+            username=username,
+            error="Keywords are required",
         )
 
     # Call the function to search messages
     search_results = search_messages(keywords)
 
     return render_template(
-        "search.html", results=search_results, username=username, error=None
+        "search.html",
+        keywords=keywords,
+        results=search_results,
+        username=username,
+        error=None,
     )
 
 
diff --git a/templates/base.html b/templates/base.html
index 3d9657a..abf89ed 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -171,7 +171,7 @@
   <!-- Search form -->
   <div id="search-form" style="width: 90%;">
       <form action="/search" method="get">
-          <input type="text" id="search-keywords" name="keywords" placeholder="Search for keywords..." style="width: 90%;">
+          <input type="text" id="search-keywords" name="keywords" placeholder="Search for keywords..." style="width: 100%;" value="{{ keywords }}">
           <input type="hidden" id="username" name="username" value="{{ username }}">
       </form>
   </div>