diff --git a/public/app/features/search/page/components/ActionRow.tsx b/public/app/features/search/page/components/ActionRow.tsx
index e1115360904..ced058db3fa 100644
--- a/public/app/features/search/page/components/ActionRow.tsx
+++ b/public/app/features/search/page/components/ActionRow.tsx
@@ -39,7 +39,7 @@ export function getValidQueryLayout(q: SearchState): SearchLayout {
 
   // Folders is not valid when a query exists
   if (layout === SearchLayout.Folders) {
-    if (q.query || q.sort || q.starred) {
+    if (q.query || q.sort || q.starred || q.tag.length > 0) {
       return SearchLayout.List;
     }
   }