diff --git a/templates/searchform.php b/templates/searchform.php
index 42e32ab..f3d4a69 100644
--- a/templates/searchform.php
+++ b/templates/searchform.php
@@ -1,6 +1,6 @@
 <form role="search" method="get" class="search-form form-inline" action="<?php echo esc_url(home_url('/')); ?>">
   <div class="input-group">
-    <input type="search" value="<?php if (is_search()) echo esc_url(home_url('/')); ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
+    <input type="search" value="<?php echo get_search_query(); ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'roots'); ?> <?php bloginfo('name'); ?>">
     <label class="hide"><?php _e('Search for:', 'roots'); ?></label>
     <span class="input-group-btn">
       <button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'roots'); ?></button>