diff --git a/copyparty/web/browser.css b/copyparty/web/browser.css
index 18ae6a16..54315bb9 100644
--- a/copyparty/web/browser.css
+++ b/copyparty/web/browser.css
@@ -3142,7 +3142,7 @@ html.d #treepar {
 		margin-top: 1.7em;
 	}
 }
-@supports (display: grid) {
+@supports (display: grid) and (gap: 1em) {
 	#ggrid {
 		display: grid;
 		margin: 0em 0.25em;
diff --git a/copyparty/web/browser.js b/copyparty/web/browser.js
index 0a8f4a78..f6fbd598 100644
--- a/copyparty/web/browser.js
+++ b/copyparty/web/browser.js
@@ -4882,6 +4882,7 @@ var thegrid = (function () {
 			duringHide: r.onhide,
 			afterShow: function () {
 				r.bbox_opts.refocus = true;
+				document.body.style.overflow = 'hidden';
 			},
 			captions: function (g) {
 				var idx = -1,
@@ -4904,6 +4905,7 @@ var thegrid = (function () {
 	};
 
 	r.onhide = function () {
+		document.body.style.overflow = '';
 		if (!thegrid.ihop)
 			return;