diff --git a/packages/theme/styles/_layouts.scss b/packages/theme/styles/_layouts.scss
index f2ac4442f8..bf1deec8da 100644
--- a/packages/theme/styles/_layouts.scss
+++ b/packages/theme/styles/_layouts.scss
@@ -92,6 +92,7 @@ table {
 
 .flex { display: flex; }
 .flex-grow { flex-grow: 1; }
+.flex-no-shrink { flex-shrink: 0; }
 .flex-nowrap {
   display: flex;
   flex-wrap: nowrap;
@@ -164,6 +165,12 @@ table {
   right: 0;
 }
 
+.vScroll {
+  flex-grow: 1;
+  overflow-x: hidden;
+  overflow-y: auto;
+}
+
 .h-full { height: 100%; }
 .square-36 { width: 2.25rem; height: 2.25rem; }
 
diff --git a/plugins/workbench-resources/src/components/EditStatuses.svelte b/plugins/workbench-resources/src/components/EditStatuses.svelte
index dfee0b3650..cfc359e87f 100644
--- a/plugins/workbench-resources/src/components/EditStatuses.svelte
+++ b/plugins/workbench-resources/src/components/EditStatuses.svelte
@@ -114,12 +114,12 @@
     </div>
     <div class="tool" on:click={() => dispatch('close')}><Close size={'small'} /></div>
   </div>
-  <div class="content">
-    <ScrollBox vertical stretch>
-      <div class="flex-between states-header">
-        <Label label={'ACTIVE STATUSES'} />
-        <div on:click={addStatus}><CircleButton icon={IconAdd} size={'medium'} /></div>
-      </div>
+  <div class="flex-grow flex-col content">
+    <div class="flex-no-shrink flex-between states-header">
+      <Label label={'ACTIVE STATUSES'} />
+      <div on:click={addStatus}><CircleButton icon={IconAdd} size={'medium'} /></div>
+    </div>
+    <div class="vScroll"><div class="h-full">
       {#each states as state, i}
         {#if state}
           <div bind:this={elements[i]} class="flex-between states" draggable={true}
@@ -148,7 +148,7 @@
           </div>
         {/if}
       {/each}
-    </ScrollBox>
+    </div></div>
   </div>
 </div>
 
@@ -184,13 +184,7 @@
         cursor: pointer;
       }
     }
-
-    .content {
-      flex-grow: 1;
-      display: flex;
-      flex-direction: column;
-      padding: 1rem 2.5rem;
-    }
+    .content { margin: 1rem 2.5rem 1rem 2.5rem; }
   }
 
   .states {