diff --git a/lib/gollum/frontend/public/javascript/gollum.js b/lib/gollum/frontend/public/javascript/gollum.js
index 8b2523c5..dbc48202 100644
--- a/lib/gollum/frontend/public/javascript/gollum.js
+++ b/lib/gollum/frontend/public/javascript/gollum.js
@@ -51,10 +51,16 @@ $(document).ready(function() {
   }
   
   if ($('#searchbar a#search-submit').length) {
+    $.GollumPlaceholder.add($('#searchbar #search-query'));
     $('#searchbar a#search-submit').click(function(e) {
       e.preventDefault();
       $('#searchbar #search-form')[0].submit();
     });
+    $('#searchbar #search-form').submit(function(e) {
+      $.GollumPlaceholder.clearAll();
+      $(this).unbind('submit');
+      $(this).submit();
+    });
   }
   
 });