From f1f544ec5b147f737c4fb7c0a8b3c909ad907e3f Mon Sep 17 00:00:00 2001
From: Alex Khomenko <Clarity-89@users.noreply.github.com>
Date: Fri, 14 Mar 2025 19:49:17 +0200
Subject: [PATCH] BrowseDashboards: Switch to list view if sort is set
 (#102196)

---
 public/app/features/search/state/SearchStateManager.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/public/app/features/search/state/SearchStateManager.ts b/public/app/features/search/state/SearchStateManager.ts
index 67dd5c93e5f..525ccefcb04 100644
--- a/public/app/features/search/state/SearchStateManager.ts
+++ b/public/app/features/search/state/SearchStateManager.ts
@@ -171,6 +171,8 @@ export class SearchStateManager extends StateManagerBase<SearchState> {
   onSortChange = (sort: string | undefined) => {
     if (sort) {
       localStorage.setItem(SEARCH_SELECTED_SORT, sort);
+      // Switch to list view if sort is set to preserve sort order when navigating back
+      localStorage.setItem(SEARCH_SELECTED_LAYOUT, SearchLayout.List);
     } else {
       localStorage.removeItem(SEARCH_SELECTED_SORT);
     }