diff --git a/contest/views.py b/contest/views.py
index 3c88dbe..8a80d7e 100644
--- a/contest/views.py
+++ b/contest/views.py
@@ -399,7 +399,7 @@ def contest_list_page(request, page=1):
     contests = Contest.objects.filter(visible=True).order_by("-create_time")
 
     # 搜索的情况
-    keyword = request.GET.get("keyword", None)
+    keyword = request.GET.get("keyword", "").strip()
     if keyword:
         contests = contests.filter(Q(title__contains=keyword) | Q(description__contains=keyword))
 
diff --git a/problem/views.py b/problem/views.py
index 90e1450..27f8c70 100644
--- a/problem/views.py
+++ b/problem/views.py
@@ -290,7 +290,7 @@ def problem_list_page(request, page=1):
     problems = Problem.objects.filter(visible=True)
 
     # 搜索的情况
-    keyword = request.GET.get("keyword", None)
+    keyword = request.GET.get("keyword", "").strip()
     if keyword:
         problems = problems.filter(Q(title__contains=keyword) | Q(description__contains=keyword))
 
diff --git a/template/src/oj/contest/contest_list.html b/template/src/oj/contest/contest_list.html
index 00fde88..ddeba9e 100644
--- a/template/src/oj/contest/contest_list.html
+++ b/template/src/oj/contest/contest_list.html
@@ -11,7 +11,7 @@
                     <div class="right">
                         <form class="form-inline" method="get">
                             <div class="form-group-sm">
-                                <input name="keyword" class="form-control" placeholder="请输入关键词">
+                                <input name="keyword" class="form-control" value="{{ keyword }}" placeholder="请输入关键词">
                                 <input type="submit" value="搜索" class="btn btn-primary">
                             </div>
                         </form>
diff --git a/template/src/oj/problem/problem_list.html b/template/src/oj/problem/problem_list.html
index 8031970..67e1314 100644
--- a/template/src/oj/problem/problem_list.html
+++ b/template/src/oj/problem/problem_list.html
@@ -11,7 +11,7 @@
                     <div class="right">
                         <form class="form-inline" method="get">
                             <div class="form-group-sm">
-                                <input name="keyword" class="form-control" placeholder="请输入关键词">
+                                <input name="keyword" class="form-control" value="{{ keyword }}" placeholder="请输入关键词">
                                 <input type="submit" value="搜索" class="btn btn-primary">
                             </div>
                         </form>