diff --git a/assets/styles/components/_forms.scss b/assets/styles/components/_forms.scss
index e69de29bb2..19dc33ea75 100644
--- a/assets/styles/components/_forms.scss
+++ b/assets/styles/components/_forms.scss
@@ -0,0 +1,15 @@
+// Search form
+.search-form {
+  @extend .form-inline;
+}
+.search-form label {
+  font-weight: normal;
+  @extend .form-group;
+}
+.search-form .search-field {
+  @extend .form-control;
+}
+.search-form .search-submit {
+  @extend .btn;
+  @extend .btn-default;
+}
diff --git a/functions.php b/functions.php
index 73534fef86..81913ecfa8 100644
--- a/functions.php
+++ b/functions.php
@@ -10,7 +10,6 @@
  * @link https://github.com/roots/sage/pull/1042
  */
 $sage_includes = [
-  'lib/utils.php',                 // Utility functions
   'lib/init.php',                  // Initial theme setup and constants
   'lib/wrapper.php',               // Theme wrapper class
   'lib/config.php',                // Configuration
diff --git a/lib/init.php b/lib/init.php
index 528c5436bd..8f525b864c 100644
--- a/lib/init.php
+++ b/lib/init.php
@@ -34,7 +34,7 @@ function setup() {
 
   // Add HTML5 markup for captions
   // http://codex.wordpress.org/Function_Reference/add_theme_support#HTML5
-  add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery']);
+  add_theme_support('html5', ['caption', 'comment-form', 'comment-list', 'gallery', 'search-form']);
 
   // Tell the TinyMCE editor to use a custom stylesheet
   add_editor_style(Assets\asset_path('styles/editor-style.css'));
diff --git a/lib/utils.php b/lib/utils.php
deleted file mode 100644
index a3632e82bc..0000000000
--- a/lib/utils.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-namespace Roots\Sage\Utils;
-
-/**
- * Tell WordPress to use searchform.php from the templates/ directory
- */
-function get_search_form() {
-  $form = '';
-  locate_template('/templates/searchform.php', true, false);
-  return $form;
-}
-add_filter('get_search_form', __NAMESPACE__ . '\\get_search_form');
diff --git a/templates/searchform.php b/templates/searchform.php
deleted file mode 100644
index b8bc8c8dbf..0000000000
--- a/templates/searchform.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<form role="search" method="get" class="search-form form-inline" action="<?= esc_url(home_url('/')); ?>">
-  <label class="sr-only"><?php _e('Search for:', 'sage'); ?></label>
-  <div class="input-group">
-    <input type="search" value="<?= get_search_query(); ?>" name="s" class="search-field form-control" placeholder="<?php _e('Search', 'sage'); ?> <?php bloginfo('name'); ?>" required>
-    <span class="input-group-btn">
-      <button type="submit" class="search-submit btn btn-default"><?php _e('Search', 'sage'); ?></button>
-    </span>
-  </div>
-</form>