diff --git a/nyaa/static/css/main.css b/nyaa/static/css/main.css
index 163e154..301605f 100644
--- a/nyaa/static/css/main.css
+++ b/nyaa/static/css/main.css
@@ -106,7 +106,8 @@ table.torrent-list thead th.sorting_desc:after {
 
 .form-control.search-bar {
     order: 1;
-    width: 88%;
+    width: 99%;
+    padding-right: 4em; // Ensure text can not flow under button
 }
 
 .search-btn {
@@ -115,6 +116,7 @@ table.torrent-list thead th.sorting_desc:after {
 	top: -34px;
 	height: 0;
     width: auto;
+	z-index: 3;
 }
 
 #navFilter-criteria {
@@ -125,7 +127,26 @@ table.torrent-list thead th.sorting_desc:after {
 	order: 4;
 }
 
-@media (min-width: 768px) {
+.nav-filter {
+	width: 100%;
+    padding: 1em 0;
+}
+
+.nav-filter .bootstrap-select {
+	width: 100% !important;
+}
+
+.bootstrap-select > button {
+    margin-top: 1em;
+}
+
+/* Allows the bootstrap selects on nav show outside the
+ collapsible section of the navigation */
+.navbar-collapse.in {
+	overflow-y: visible;
+}
+
+@media (min-width: 991px) {
 	.search-btn {
 		top: 0;
 		width: auto;
diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html
index 3c3e121..468e30f 100644
--- a/nyaa/templates/layout.html
+++ b/nyaa/templates/layout.html
@@ -146,14 +146,14 @@
 				{% endif %}
 					<div class="input-group search-container">
 						<input type="text" class="form-control search-bar" name="q" placeholder="Search..." value="{{ search["term"] if search is defined else '' }}">
-						<div class="input-group-btn" id="navFilter-criteria">
+						<div class="input-group-btn nav-filter" id="navFilter-criteria">
 							<select class="selectpicker show-tick" title="Filter" data-width="120px" name="f">
 								<option value="0" title="Show all" {% if search is defined and search["quality_filter"] == "0" %}selected{% else %}selected{% endif %}>Show all</option>
 								<option value="1" title="No remakes" {% if search is defined and search["quality_filter"] == "1" %}selected{% endif %}>No remakes</option>
 								<option value="2" title="Trusted only" {% if search is defined and search["quality_filter"] == "2" %}selected{% endif %}>Trusted only</option>
 							</select>
 						</div>
-						<div class="input-group-btn" id="navFilter-category">
+						<div class="input-group-btn nav-filter" id="navFilter-category">
 							{% set nyaa_cats = [('1_0', 'Anime', 'Anime'),
 												('1_1', '- Anime Music Video', 'Anime - AMV'),
 												('1_2', '- English-translated', 'Anime - English'),