diff --git a/frontend/src/app/shared/components/schema-category.component.html b/frontend/src/app/shared/components/schema-category.component.html
index f81719618..137810997 100644
--- a/frontend/src/app/shared/components/schema-category.component.html
+++ b/frontend/src/app/shared/components/schema-category.component.html
@@ -32,7 +32,7 @@
 
         <div [hidden]="isCollapsed" [style.height]="getContainerHeight()" class="nav-collapsed">
             <ng-container *ngIf="!forContent; else simpleMode">
-                <li *ngFor="let schema of schemas; trackBy: trackBySchema" class="nav-item truncate" [style.height]="getItemHeight()"
+                <li *ngFor="let schema of schemas; trackBy: trackBySchema" class="nav-item truncate"
                     cdkDrag
                     [cdkDragData]="schema"
                     (cdkDragStarted)="dragStarted($event)">
diff --git a/frontend/src/app/shared/components/schema-category.component.ts b/frontend/src/app/shared/components/schema-category.component.ts
index 8063e9364..d922c2a41 100644
--- a/frontend/src/app/shared/components/schema-category.component.ts
+++ b/frontend/src/app/shared/components/schema-category.component.ts
@@ -9,7 +9,7 @@ import { CdkDragDrop, CdkDragStart } from '@angular/cdk/drag-drop';
 import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnChanges, Output } from '@angular/core';
 import { LocalStoreService, SchemaCategory, SchemaDto, SchemasState } from '@app/shared/internal';
 
-const ITEM_HEIGHT = 2.25;
+const ITEM_HEIGHT = 2.5;
 
 @Component({
     selector: 'sqx-schema-category[schemaCategory]',
diff --git a/frontend/src/app/shared/components/search/query-list.component.html b/frontend/src/app/shared/components/search/query-list.component.html
index e435a63e0..1f9647d9b 100644
--- a/frontend/src/app/shared/components/search/query-list.component.html
+++ b/frontend/src/app/shared/components/search/query-list.component.html
@@ -1,7 +1,7 @@
 <ng-container *ngIf="queries && queries.length > 0; else noQuery">
-    <div class="nav nav-light flex-column">
-        <div class="nav-item">
-            <a class="nav-link" *ngFor="let saved of queries; trackBy: trackByQuery" (click)="search.emit(saved.query)" [class.active]="isSelectedQuery(saved)">
+    <ul class="nav nav-light flex-column">
+        <li class="nav-item" *ngFor="let saved of queries; trackBy: trackByQuery">
+            <a class="nav-link" (click)="search.emit(saved.query)" [class.active]="isSelectedQuery(saved)">
                 <div class="row g-0">
                     <div class="col truncate">
                         <i class="icon-circle" [style.color]="saved.color" [class.hidden]="!saved.color"></i> {{saved.name | sqxTranslate}}
@@ -13,8 +13,8 @@
                     </div>
                 </div>     
             </a>
-        </div>
-    </div>
+        </li>
+    </ul>
 </ng-container>
 
 <ng-template #noQuery>
diff --git a/frontend/src/app/theme/_panels2.scss b/frontend/src/app/theme/_panels2.scss
index 2a66f0526..540d3d8d3 100644
--- a/frontend/src/app/theme/_panels2.scss
+++ b/frontend/src/app/theme/_panels2.scss
@@ -269,6 +269,8 @@
 
     .nav-item {
         height: 2.25rem;
+        margin-bottom: .25rem;
+        margin-top: 0;
     }
 
     .nav-item {