diff --git a/src/app/components/sidenav/sidenav.component.html b/src/app/components/sidenav/sidenav.component.html
index 6a84c7f1d..799e54c2b 100644
--- a/src/app/components/sidenav/sidenav.component.html
+++ b/src/app/components/sidenav/sidenav.component.html
@@ -4,30 +4,32 @@
       <app-create-menu [expanded]="mode === 'expanded'"></app-create-menu>
     </div>
 
-    <div *ngFor="let group of groups; trackBy: trackById" class="section" [ngClass]="'section--' + mode">
-      <ng-container *ngSwitchCase="'expanded'">
-        <mat-list-item *ngFor="let item of group.items; trackBy: trackById">
-          <ng-container *ngIf="!item.component">
-            <app-expand-menu [item]="item"></app-expand-menu>
-          </ng-container>
+    <div class="section-sub-actions">
+      <div *ngFor="let group of groups; trackBy: trackById" class="section" [ngClass]="'section--' + mode">
+        <ng-container *ngSwitchCase="'expanded'">
+          <mat-list-item *ngFor="let item of group.items; trackBy: trackById">
+            <ng-container *ngIf="!item.component">
+              <app-expand-menu [item]="item"></app-expand-menu>
+            </ng-container>
 
-          <ng-container *ngIf="item.component">
-            <adf-dynamic-component [data]="{ item: item, state: 'expanded' }" [id]="item.component"></adf-dynamic-component>
-          </ng-container>
-        </mat-list-item>
-      </ng-container>
+            <ng-container *ngIf="item.component">
+              <adf-dynamic-component [data]="{ item: item, state: 'expanded' }" [id]="item.component"></adf-dynamic-component>
+            </ng-container>
+          </mat-list-item>
+        </ng-container>
 
-      <ng-container *ngSwitchCase="'collapsed'">
-        <div class="list-item" *ngFor="let item of group.items; trackBy: trackById">
-          <ng-container *ngIf="!item.component">
-            <app-button-menu [item]="item"></app-button-menu>
-          </ng-container>
+        <ng-container *ngSwitchCase="'collapsed'">
+          <div class="list-item" *ngFor="let item of group.items; trackBy: trackById">
+            <ng-container *ngIf="!item.component">
+              <app-button-menu [item]="item"></app-button-menu>
+            </ng-container>
 
-          <ng-container *ngIf="item.component">
-            <adf-dynamic-component [data]="{ item: item, state: 'collapsed' }" [id]="item.component"> </adf-dynamic-component>
-          </ng-container>
-        </div>
-      </ng-container>
+            <ng-container *ngIf="item.component">
+              <adf-dynamic-component [data]="{ item: item, state: 'collapsed' }" [id]="item.component"> </adf-dynamic-component>
+            </ng-container>
+          </div>
+        </ng-container>
+      </div>
     </div>
   </ng-container>
 </div>
diff --git a/src/app/components/sidenav/sidenav.component.scss b/src/app/components/sidenav/sidenav.component.scss
index 760941a2e..811ed0a5a 100644
--- a/src/app/components/sidenav/sidenav.component.scss
+++ b/src/app/components/sidenav/sidenav.component.scss
@@ -3,6 +3,7 @@
   flex: 1;
   flex-direction: column;
   height: 100%;
+  overflow-y: hidden;
 }
 
 .sidenav {
@@ -24,6 +25,11 @@
 
   .section.action-menu {
     padding: 8px 14px;
+    position: sticky;
+  }
+
+  .section-sub-actions {
+    overflow-y: auto;
   }
 
   .section {