diff --git a/chrome/content/scaffold/scaffold.xhtml b/chrome/content/scaffold/scaffold.xhtml
index 6faa6831ed..b426643c76 100644
--- a/chrome/content/scaffold/scaffold.xhtml
+++ b/chrome/content/scaffold/scaffold.xhtml
@@ -39,7 +39,7 @@
 	<!ENTITY % scaffoldDTD SYSTEM "chrome://scaffold/locale/scaffold.dtd"> %scaffoldDTD;
 ]>
 
-<window id="scaffold" width="800" height="600" minheight="600" persist="screenX screenY width height"
+<window id="scaffold" persist="screenX screenY width height"
 	title="Scaffold"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 	xmlns:html="http://www.w3.org/1999/xhtml"
diff --git a/scss/scaffold.scss b/scss/scaffold.scss
index 61e000cf67..472aea50e2 100644
--- a/scss/scaffold.scss
+++ b/scss/scaffold.scss
@@ -29,6 +29,10 @@ $scaffold-toolbarbutton-icons: (
 	}
 };
 
+#scaffold {
+	min-height: 600px;
+}
+
 .menubar-container {
 	display: flex;
 	background: var(--material-sidepane);