diff --git a/engine/api/workflow/dao.go b/engine/api/workflow/dao.go
index a757edec2a..e0447fe022 100644
--- a/engine/api/workflow/dao.go
+++ b/engine/api/workflow/dao.go
@@ -516,13 +516,14 @@ func load(ctx context.Context, db gorp.SqlExecutor, store cache.Store, proj *sdk
 	dbRes := Workflow{}
 
 	_, next := observability.Span(ctx, "workflow.load.selectOne")
-	if err := db.SelectOne(&dbRes, query, args...); err != nil {
+	err := db.SelectOne(&dbRes, query, args...)
+	next()
+	if err != nil {
 		if err == sql.ErrNoRows {
 			return nil, sdk.ErrWorkflowNotFound
 		}
 		return nil, sdk.WrapError(err, "Unable to load workflow")
 	}
-	next()
 
 	res := sdk.Workflow(dbRes)
 	if proj.Key == "" {
@@ -538,11 +539,11 @@ func load(ctx context.Context, db gorp.SqlExecutor, store cache.Store, proj *sdk
 	// Load groups
 	_, next = observability.Span(ctx, "workflow.load.loadWorkflowGroups")
 	gps, err := group.LoadWorkflowGroups(db, res.ID)
+	next()
 	if err != nil {
 		return nil, sdk.WrapError(err, "Unable to load workflow groups")
 	}
 	res.Groups = gps
-	next()
 
 	res.Pipelines = map[int64]sdk.Pipeline{}
 	res.Applications = map[int64]sdk.Application{}
diff --git a/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.html b/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.html
index f0ef37dba1..533d7c02f0 100644
--- a/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.html
+++ b/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.html
@@ -72,14 +72,17 @@ <h3 class="ui header">
                     {{currentWorkflowNodeRun.start | amLocal | amDateFormat: 'DD/MM/YYYY HH:mm' }}</div>
             </div>
         </div>
-        <div *ngIf="currentWorkflowNodeRun && currentWorkflowNodeRun.stages && currentWorkflowNodeRun.stages.length > 0"
-            class="ui vertical fluid steps">
-            <ng-container *ngFor="let stage of currentWorkflowNodeRun.stages">
-                <app-stage-step-summary [stage]="stage" [workflowRun]="currentWorkflowRun" [workflowNode]="node"
-                    [workflowNodeRun]="currentWorkflowNodeRun">
-                </app-stage-step-summary>
-            </ng-container>
-        </div>
+        <ng-container *ngIf="currentWorkflowNodeRun && currentWorkflowNodeRun.stages && currentWorkflowNodeRun.stages.length > 0">
+            <div class="stageContainer">
+                <div class="ui vertical fluid steps">
+                    <ng-container *ngFor="let stage of currentWorkflowNodeRun.stages">
+                        <app-stage-step-summary [stage]="stage" [workflowRun]="currentWorkflowRun" [workflowNode]="node"
+                                                [workflowNodeRun]="currentWorkflowNodeRun">
+                        </app-stage-step-summary>
+                    </ng-container>
+                </div>
+            </div>
+        </ng-container>
     </ng-container>
     <div class="logs" *ngIf="currentWorkflowNodeRun && currentWorkflowNodeRun.callback">
         <h4 class="ui header">
diff --git a/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.scss b/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.scss
index 52560026a5..1d5a93eb83 100644
--- a/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.scss
+++ b/ui/src/app/shared/workflow/sidebar/run-node/workflow.sidebar.run.node.component.scss
@@ -18,6 +18,10 @@
     padding: 10px;
   }
 
+  .stageContainer {
+    overflow-y: auto;
+  }
+
   .steps {
     :host-context(.night) & {
       background-color: $darkTheme_grey_1;
@@ -39,4 +43,4 @@
   pre {
     white-space: pre-line;
   }
-}
\ No newline at end of file
+}
diff --git a/ui/src/app/views/workflow/run/node/pipeline/step/step.log.html b/ui/src/app/views/workflow/run/node/pipeline/step/step.log.html
index a7ed76428e..2e970e1256 100644
--- a/ui/src/app/views/workflow/run/node/pipeline/step/step.log.html
+++ b/ui/src/app/views/workflow/run/node/pipeline/step/step.log.html
@@ -50,7 +50,7 @@
                   [class.active]="selectedLine === logLine.lineNumber"
                   id="L{{job.pipeline_stage_id}}-{{job.pipeline_action_id}}-{{stepOrder}}-{{logLine.lineNumber}}"
                   *ngIf="!last">
-                  <td class="number yellow right aligned pointing" (click)="generateLink(logLine.lineNumber)">{{logLine.lineNumber}}</td>
+                  <td class="number right aligned pointing" (click)="generateLink(logLine.lineNumber)">{{logLine.lineNumber}}</td>
                   <td [innerHTML]="logLine.value | safeHtml:!htmlViewSelected" *ngIf="ansiViewSelected || htmlViewSelected"></td><td [innerText]="logLine.value" *ngIf="!ansiViewSelected && !htmlViewSelected"></td>
                 </tr>
                 <tr *ngIf="logLine.lineNumber === limitFrom" valign="middle" class="fold-log pointing" (click)="showAllLogs()">