diff --git a/apps/web/src/app/stalker/stalker-main-container.component.html b/apps/web/src/app/stalker/stalker-main-container.component.html
index bd7374da4..86ef1868f 100644
--- a/apps/web/src/app/stalker/stalker-main-container.component.html
+++ b/apps/web/src/app/stalker/stalker-main-container.component.html
@@ -90,19 +90,17 @@
 <div class="main-content">
     <div class="content-header">
         <h2>
-            @if (
-                currentLayout === 'vod-details' ||
-                currentLayout === 'serial-details'
-            ) {
-                <button mat-icon-button (click)="historyBack()">
+            @if (stalkerStore.selectedItem()) {
+                <button mat-icon-button (click)="goBackToList()">
                     <mat-icon>chevron_left</mat-icon>
                 </button>
+            } @else if (!isItvCategorySelected) {
+                <button mat-icon-button disabled>
+                    <mat-icon>category</mat-icon>
+                </button>
             }
 
             @if (!isItvCategorySelected) {
-                <button mat-icon-button disabled>
-                    <mat-icon>category</mat-icon>
-                </button>
                 {{ selectedCategoryTitle() }}
             }
 
diff --git a/apps/web/src/app/stalker/stalker-main-container.component.ts b/apps/web/src/app/stalker/stalker-main-container.component.ts
index 16d39fe1c..5396e8223 100644
--- a/apps/web/src/app/stalker/stalker-main-container.component.ts
+++ b/apps/web/src/app/stalker/stalker-main-container.component.ts
@@ -236,4 +236,8 @@ export class StalkerMainContainerComponent {
     backToCategories() {
         this.stalkerStore.setSelectedCategory(null);
     }
+
+    goBackToList() {
+        this.stalkerStore.clearSelectedItem();
+    }
 }
diff --git a/apps/web/src/app/stalker/stalker.store.ts b/apps/web/src/app/stalker/stalker.store.ts
index 1da396a13..62335697b 100644
--- a/apps/web/src/app/stalker/stalker.store.ts
+++ b/apps/web/src/app/stalker/stalker.store.ts
@@ -332,6 +332,14 @@ export const StalkerStore = signalStore(
                     selectedItem,
                 });
             },
+            clearSelectedItem() {
+                patchState(store, {
+                    selectedVodId: undefined,
+                    selectedSerialId: undefined,
+                    selectedItvId: undefined,
+                    selectedItem: undefined,
+                });
+            },
             setCategories(type: 'vod' | 'series' | 'itv', categories: any[]) {
                 if (type === 'vod') {
                     patchState(store, { vodCategories: categories });