diff --git a/scripts/pi-hole/js/queries.js b/scripts/pi-hole/js/queries.js
index 4c63c640..8a9b1809 100644
--- a/scripts/pi-hole/js/queries.js
+++ b/scripts/pi-hole/js/queries.js
@@ -263,7 +263,7 @@ function formatInfo(data) {
 
   // Parse Query Status
   var queryStatus = parseQueryStatus(data);
-  var divStart = '<div class="col-xl-2 col-lg-4 col-md-6 col-12">';
+  var divStart = '<div class="col-xl-2 col-lg-4 col-md-6 col-12 overflow-wrap">';
   var statusInfo = "";
   if (queryStatus.colorClass !== false) {
     statusInfo =
diff --git a/scripts/pi-hole/js/taillog.js b/scripts/pi-hole/js/taillog.js
index 20e01177..65d1858f 100644
--- a/scripts/pi-hole/js/taillog.js
+++ b/scripts/pi-hole/js/taillog.js
@@ -137,7 +137,22 @@ function getData() {
 var gAutoScrolling = true;
 $("#output").on("scroll", function () {
   // Check if we are at the bottom of the output
-  if ($("#output").scrollTop() + $("#output").innerHeight() >= $("#output")[0].scrollHeight) {
+  //
+  // - $("#output")[0].scrollHeight: This gets the entire height of the content
+  //   of the "output" element, including the part that is not visible due to
+  //   scrolling.
+  // - $("#output").innerHeight(): This gets the inner height of the "output"
+  //   element, which is the visible part of the content.
+  // - $("#output").scrollTop(): This gets the number of pixels that the content
+  //   of the "output" element is scrolled vertically from the top.
+  //
+  // By subtracting the inner height and the scroll top from the scroll height,
+  // you get the distance from the bottom of the scrollable area.
+  const bottom =
+    $("#output")[0].scrollHeight - $("#output").innerHeight() - $("#output").scrollTop();
+  // Add a tolerance of four line heights
+  const tolerance = 4 * parseFloat($("#output").css("line-height"));
+  if (bottom <= tolerance) {
     // Auto-scrolling is enabled
     gAutoScrolling = true;
     $("#autoscrolling").addClass("fa-check");
diff --git a/style/pi-hole.css b/style/pi-hole.css
index 65c96a12..dfbd414b 100644
--- a/style/pi-hole.css
+++ b/style/pi-hole.css
@@ -1441,3 +1441,8 @@ table.dataTable tbody > tr > .selected {
   grid-auto-flow: column;
   grid-column-gap: 15px;
 }
+
+.overflow-wrap {
+  overflow-wrap: break-word;
+  inline-size: auto;
+}