diff --git a/netbox/netbox/forms.py b/netbox/netbox/forms.py
index 69db4fba5..caa074e18 100644
--- a/netbox/netbox/forms.py
+++ b/netbox/netbox/forms.py
@@ -38,7 +38,7 @@ OBJ_TYPE_CHOICES = (
 
 class SearchForm(BootstrapMixin, forms.Form):
     q = forms.CharField(
-        label='Search', widget=forms.TextInput(attrs={'style': 'width: 350px'})
+        label='Search'
     )
     obj_type = forms.ChoiceField(
         choices=OBJ_TYPE_CHOICES, required=False, label='Type'
diff --git a/netbox/templates/search_form.html b/netbox/templates/search_form.html
index b60d879b7..987c3db2f 100644
--- a/netbox/templates/search_form.html
+++ b/netbox/templates/search_form.html
@@ -1,7 +1,7 @@
 <div class="row" style="padding-bottom: 20px">
     <div class="col-md-12 text-center">
         <form action="{% url 'search' %}" method="get" class="form-inline">
-            {{ search_form.q }}
+            <input type="text" name="q" value="{{ request.GET.q }}" placeholder="Search" id="id_q" class="form-control" style="width: 350px" />
             {{ search_form.obj_type }}
             <button type="submit" class="btn btn-primary">Search</button>
         </form>