diff --git a/src/frontend/app/ui/gallery/grid/grid.gallery.component.html b/src/frontend/app/ui/gallery/grid/grid.gallery.component.html
index 895ac507..474c21f7 100644
--- a/src/frontend/app/ui/gallery/grid/grid.gallery.component.html
+++ b/src/frontend/app/ui/gallery/grid/grid.gallery.component.html
@@ -1,4 +1,5 @@
-<div #gridContainer [style.width]="renderDelayTimer ? containerWidth+'px' : ''">
+<div #gridContainer [style.min-height]="containerMinHeight+'px'"
+     [style.width]="renderDelayTimer ? containerWidth+'px' : ''">
   <ng-container *ngIf="mediaToRender?.length > 0">
     <ng-container *ngFor="let group of mediaToRender">
       <ng-container *ngIf="group.name">
@@ -10,11 +11,11 @@
             </h6>
           </div>
           <div *ngSwitchCase="GroupByTypes.PersonCount" class="mt-4 mb-3">
-            <h6 class="ms-2">{{group.name}}
+            <h6 class="ms-2">{{ group.name }}
               <ng-icon class="ms-1" name="ionPeopleOutline"></ng-icon>
             </h6>
           </div>
-          <div *ngSwitchDefault class="mt-4 mb-3"><h6 class="ms-2">{{group.name}}</h6></div>
+          <div *ngSwitchDefault class="mt-4 mb-3"><h6 class="ms-2">{{ group.name }}</h6></div>
         </ng-container>
       </ng-container>
 
diff --git a/src/frontend/app/ui/gallery/grid/grid.gallery.component.ts b/src/frontend/app/ui/gallery/grid/grid.gallery.component.ts
index fdf5a0c2..af9ca447 100644
--- a/src/frontend/app/ui/gallery/grid/grid.gallery.component.ts
+++ b/src/frontend/app/ui/gallery/grid/grid.gallery.component.ts
@@ -58,6 +58,7 @@ export class GalleryGridComponent
   @Input() mediaGroups: MediaGroup[];
   mediaToRender: GridMediaGroup[] = [];
   containerWidth = 0;
+  containerMinHeight = 0; // used to fix container height while updating photos to prevent flickering
   screenHeight = 0;
   isAfterViewInit = false;
   subscriptions: {
@@ -94,9 +95,14 @@ export class GalleryGridComponent
     if (this.isAfterViewInit === false) {
       return;
     }
+
+    this.containerMinHeight = this.gridContainer.nativeElement.clientHeight; // reduce flickering
     this.updateContainerDimensions();
     this.mergeNewPhotos();
     this.renderMinimalPhotos();
+    setTimeout(() => {
+      this.containerMinHeight = 0; // remove min height after new photos are rendered
+    }, 0);
   }
 
   ngOnInit(): void {