diff --git a/frontend/src/app/components/home/home.component.html b/frontend/src/app/components/home/home.component.html
index 991d92e..6731a24 100644
--- a/frontend/src/app/components/home/home.component.html
+++ b/frontend/src/app/components/home/home.component.html
@@ -9,7 +9,7 @@
   ></app-header>
   <!-- Hero Banner -->
   <app-hero-banner
-    *ngIf="currentVideo !== null || (isWideScreenView && currentVideo !== null)"
+    *ngIf="currentVideo || (isWideScreenView && currentVideo)"
     [videos]="videos"
     [isWideScreen]="isWideScreenView"
     [currentVideo]="currentVideo"
@@ -25,7 +25,7 @@
   <div *ngIf="!isWideScreenView" class="spacer"></div>
   <!-- Video Categories -->
   <app-categories
-    *ngIf="isWideScreenView || (!isWideScreenView && currentVideo !== null)"
+    *ngIf="isWideScreenView || (!isWideScreenView && !currentVideo)"
     [videos]="videos"
     [currentVideo]="currentVideo"
     [favoriteVideos]="favoriteVideos"
diff --git a/frontend/src/app/components/home/home.component.ts b/frontend/src/app/components/home/home.component.ts
index 29e49fd..91a5747 100644
--- a/frontend/src/app/components/home/home.component.ts
+++ b/frontend/src/app/components/home/home.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, ViewChild } from '@angular/core';
+import { Component, HostListener, OnInit, ViewChild } from '@angular/core';
 import { HeaderComponent } from '../../shared/components/header/header.component';
 import { HeroBannerComponent } from './hero-banner/hero-banner.component';
 import { CategoriesComponent } from './categories/categories.component';
@@ -233,4 +233,23 @@ export class HomeComponent implements OnInit {
   toggleUploadVideoOverview(value: boolean): void {
     this.uploadVideoOverview = value;
   }
+
+  /**
+   * Listens for window resize events and triggers the screen size check.
+   *
+   * @param event The resize event triggered when the window is resized.
+   */
+  @HostListener('window:resize', ['$event'])
+  onResize(event: Event): void {
+    this.checkScreenSize();
+  }
+
+  /**
+   * Checks the screen size and selects a random video if wide screen and no video is selected.
+   */
+  private checkScreenSize(): void {
+    if (this.isWideScreenView && !this.currentVideo) {
+      this.selectRandomVideoAsCurrent();
+    }
+  }
 }