diff --git a/edit/edit.css b/edit/edit.css
index 21f27057..0af83c6b 100644
--- a/edit/edit.css
+++ b/edit/edit.css
@@ -311,6 +311,7 @@ input:invalid {
 }
 .section .CodeMirror {
   margin-bottom: .875rem;
+  box-sizing: border-box;
 }
 /* deleted section */
 .deleted-section {
diff --git a/edit/refresh-on-view.js b/edit/refresh-on-view.js
index 0fa123d6..ffbc0589 100644
--- a/edit/refresh-on-view.js
+++ b/edit/refresh-on-view.js
@@ -10,6 +10,7 @@ CodeMirror.defineExtension('refreshOnView', function () {
   const cm = this;
   if (typeof IntersectionObserver === 'undefined') {
     // uh
+    cm.isRefreshed = true;
     cm.refresh();
     return;
   }
@@ -18,6 +19,7 @@ CodeMirror.defineExtension('refreshOnView', function () {
     for (const entry of entries) {
       if (entry.isIntersecting) {
         // wrapper.style.visibility = 'visible';
+        cm.isRefreshed = true;
         cm.refresh();
         observer.disconnect();
       }
diff --git a/edit/sections-editor.js b/edit/sections-editor.js
index 99772f2b..6242dbb6 100644
--- a/edit/sections-editor.js
+++ b/edit/sections-editor.js
@@ -48,12 +48,11 @@ function createSectionsEditor({style, onTitleChanged}) {
   const initializing = new Promise(resolve => initSection({
     sections: style.sections.slice(),
     done:() => {
-      // FIXME: implement this with CSS?
-      // https://github.com/openstyles/stylus/commit/2895ce11e271788df0e4f7314b3b981fde086574
       dirty.clear();
       rerouteHotkeys(true);
       resolve();
       updateHeader();
+      sections.forEach(fitToContent);
     }
   }));
 
@@ -80,6 +79,40 @@ function createSectionsEditor({style, onTitleChanged}) {
     getSearchableInputs,
   };
 
+  function fitToContent(section) {
+    if (section.cm.isRefreshed) {
+      resize();
+    } else {
+      section.cm.on('update', resize);
+    }
+
+    function resize() {
+      let contentHeight = section.el.querySelector('.CodeMirror-sizer').offsetHeight;
+      if (contentHeight < section.cm.defaultTextHeight()) {
+        return;
+      }
+      contentHeight += 9; // border & resize grip
+      section.cm.off('update', resize);
+      const cmHeight = section.cm.getWrapperElement().offsetHeight;
+      const maxHeight = cmHeight + window.innerHeight - section.el.offsetHeight;
+      section.cm.setSize(null, Math.min(contentHeight, maxHeight));
+      if (sections.every(s => s.cm.isRefreshed)) {
+        fitToAvailableSpace();
+      }
+    }
+  }
+
+  function fitToAvailableSpace() {
+    const available = window.innerHeight - container.offsetHeight;
+    if (available <= 0) {
+      return;
+    }
+    for (const section of sections) {
+      const cmHeight = section.cm.getWrapperElement().offsetHeight;
+      section.cm.setSize(null, cmHeight + Math.floor(available / sections.length));
+    }
+  }
+
   function genId() {
     return INC_ID++;
   }