diff --git a/scripts/pi-hole/js/list.js b/scripts/pi-hole/js/list.js
index b9167065..1b01387c 100644
--- a/scripts/pi-hole/js/list.js
+++ b/scripts/pi-hole/js/list.js
@@ -208,11 +208,19 @@ $(function(){
     });
 });
 
-$(document).ready(function () {
-    if (screen.width < 576) {
-        $(".input-group-btn").css("display", "initial");
+// Wrap form-group's buttons to next line when viewed on a small screen
+$(window).on("resize",function() {
+    if ($(window).width() < 991) {
+        $(".form-group.input-group").removeClass("input-group").addClass("input-group-block");
+        $(".form-group.input-group-block > input").css("margin-bottom", "5px");
+        $(".form-group.input-group-block > .input-group-btn").removeClass("input-group-btn").addClass("btn-block text-center");
     }
     else {
-        $(".input-group-btn").css("display", "table-cell");
+        $(".form-group.input-group-block").removeClass("input-group-block").addClass( "input-group" );
+        $(".form-group.input-group > input").css("margin-bottom","");
+        $(".form-group.input-group > .btn-block.text-center").removeClass("btn-block text-center").addClass("input-group-btn");
     }
 });
+$(document).ready(function() {
+    $(window).trigger("resize");
+});
diff --git a/scripts/pi-hole/js/queryads.js b/scripts/pi-hole/js/queryads.js
index 1b328566..5d56068f 100644
--- a/scripts/pi-hole/js/queryads.js
+++ b/scripts/pi-hole/js/queryads.js
@@ -122,3 +122,20 @@ $("#btnSearchExact").on("click", function() {
     exact = "exact";
     eventsource();
 });
+
+// Wrap form-group's buttons to next line when viewed on a small screen
+$(window).on("resize",function() {
+    if ($(window).width() < 991) {
+        $(".form-group.input-group").removeClass("input-group").addClass("input-group-block");
+        $(".form-group.input-group-block > input").css("margin-bottom", "5px");
+        $(".form-group.input-group-block > .input-group-btn").removeClass("input-group-btn").addClass("btn-block text-center");
+    }
+    else {
+        $(".form-group.input-group-block").removeClass("input-group-block").addClass( "input-group" );
+        $(".form-group.input-group > input").css("margin-bottom","");
+        $(".form-group.input-group > .btn-block.text-center").removeClass("btn-block text-center").addClass("input-group-btn");
+    }
+});
+$(document).ready(function() {
+    $(window).trigger("resize");
+});