diff --git a/media/plg_system_debug/js/debug.js b/media/plg_system_debug/js/debug.js
index ec2e996555d23..2e10418e5ede1 100644
--- a/media/plg_system_debug/js/debug.js
+++ b/media/plg_system_debug/js/debug.js
@@ -18,7 +18,7 @@ Joomla = window.Joomla || {};
 		var sidebarWrapper = document.getElementById('sidebar-wrapper'),
 		    debugWrapper   = document.getElementById('system-debug');
 		if (sidebarWrapper && debugWrapper) {
-			debugWrapper.style.marginLeft = '60px';
+			debugWrapper.style.marginLeft = '5px';
 		}
 	});
 
diff --git a/media/plg_system_debug/js/debug.min.js b/media/plg_system_debug/js/debug.min.js
index 2137ae591d629..638383f031a2c 100644
--- a/media/plg_system_debug/js/debug.min.js
+++ b/media/plg_system_debug/js/debug.min.js
@@ -1 +1 @@
-Joomla=window.Joomla||{},function(e,t){"use strict";t.addEventListener("DOMContentLoaded",function(){e.toggleContainer=function(e){var n=t.getElementById(e);n.style.display="none"==n.style.display?"block":"none"};var n=t.getElementById("sidebar-wrapper"),o=t.getElementById("system-debug");n&&o&&(o.style.marginLeft="60px")})}(Joomla,document);
\ No newline at end of file
+Joomla=window.Joomla||{},function(e,t){"use strict";t.addEventListener("DOMContentLoaded",function(){e.toggleContainer=function(e){var n=t.getElementById(e);n.style.display="none"==n.style.display?"block":"none"};var n=t.getElementById("sidebar-wrapper"),o=t.getElementById("system-debug");n&&o&&(o.style.marginLeft="5px")})}(Joomla,document);
diff --git a/plugins/system/debug/debug.php b/plugins/system/debug/debug.php
index d9a65491235e8..a180fc56da03b 100644
--- a/plugins/system/debug/debug.php
+++ b/plugins/system/debug/debug.php
@@ -352,7 +352,7 @@ public function onAfterRespond()
 
 		$html[] = '</div>';
 
-		echo str_replace('</body>', implode('', $html) . '</body>', $contents);
+		echo preg_replace('%</div>[\s]*</body>%', implode('', $html) . '</div></body>', $contents);
 	}
 
 	/**