Switching between Media Gallery bookmarks does not change the selected folder

app/code/Magento/MediaGalleryUi/Test/Mftf/ActionGroup/AssertFolderIsChangedActionGroup.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AssertFolderIsChangedActionGroup">
+        <annotations>
+            <description>Assert that folder is changed</description>
+        </annotations>
+        <arguments>
+            <argument name="newSelectedFolder" type="string"/>
+            <argument name="oldSelectedFolder" type="string" defaultValue="{{AdminMediaGalleryFolderData.name}}"/>
+        </arguments>
+
+        <assertNotEquals stepKey="assertNotEqual">
+            <actualResult type="string">{{newSelectedFolder}}</actualResult>
+            <expectedResult type="string">{{oldSelectedFolder}}</expectedResult>
+        </assertNotEquals>
+    </actionGroup>
+</actionGroups>

app/code/Magento/MediaGalleryUi/Test/Mftf/Test/AdminMediaGallerySwitchingBetweenViewsTest.xml

@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="AdminMediaGallerySwitchingBetweenViewsTest">
+        <annotations>
+            <features value="MediaGallery"/>
+            <useCaseId value="https://github.com/magento/adobe-stock-integration/issues/1523"/>
+            <title value="User switches between Views and checks if the folder is changed"/>
+            <stories value="User switches between Views and checks if the folder is changed"/>
+            <testCaseId value="https://studio.cucumber.io/projects/131313/test-plan/folders/1337102/scenarios/5060037"/>
+            <description value="User switches between Views and checks if the folder is changed"/>
+            <severity value="CRITICAL"/>
+            <group value="media_gallery_ui"/>
+        </annotations>
+        <before>
+            <createData entity="SimpleSubCategory" stepKey="category"/>
+            <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
+        </before>
+        <after>
+            <actionGroup ref="ResetAdminDataGridToDefaultViewActionGroup" stepKey="resetAdminDataGridToDefaultView"/>
+            <actionGroup ref="AdminEnhancedMediaGalleryDeleteGridViewActionGroup" stepKey="deleteView">
+                <argument name="viewToDelete" value="New View"/>
+            </actionGroup>
+            <actionGroup ref="AdminMediaGalleryFolderSelectActionGroup" stepKey="selectFolderForDelete"/>
+            <actionGroup ref="AdminMediaGalleryFolderDeleteActionGroup" stepKey="deleteFolder"/>
+            <actionGroup ref="AdminMediaGalleryAssertFolderDoesNotExistActionGroup" stepKey="assertFolderWasDeleted"/>
+            <deleteData createDataKey="category" stepKey="deleteCategory"/>
+        </after>
+        <actionGroup ref="AdminOpenCreateNewCMSPageActionGroup" stepKey="openNewPage"/>
+        <actionGroup ref="AdminOpenMediaGalleryFromPageNoEditorActionGroup" stepKey="openMediaGalleryForPage"/>
+        <actionGroup ref="ClearFiltersAdminDataGridActionGroup" stepKey="clearFilters"/>
+        <actionGroup ref="AdminMediaGalleryOpenNewFolderFormActionGroup" stepKey="openNewFolderForm"/>
+        <actionGroup ref="AdminMediaGalleryCreateNewFolderActionGroup" stepKey="createNewFolder"/>
+        <actionGroup ref="AdminMediaGalleryAssertFolderNameActionGroup" stepKey="assertNewFolderCreated"/>
+        <waitForLoadingMaskToDisappear stepKey="waitForFolderContents"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySaveCustomViewActionGroup" stepKey="saveCustomView">
+            <argument name="viewName" value="New View"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenCategoryPageActionGroup" stepKey="openCategoryPage"/>
+        <actionGroup ref="AdminCategoriesOpenCategoryActionGroup" stepKey="openCategory">
+            <argument name="category" value="$$category$$"/>
+        </actionGroup>
+        <actionGroup ref="AdminOpenMediaGalleryFromCategoryImageUploaderActionGroup" stepKey="openMediaGalleryFromImageUploader"/>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="selectDefaultView">
+            <argument name="selectView" value="Default View"/>
+        </actionGroup>
+        <actionGroup ref="AssertFolderIsChangedActionGroup" stepKey="assertFolderIsChanged">
+            <argument name="newSelectedFolder" value="category" />
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGallerySelectCustomBookmarksViewActionGroup" stepKey="switchBackToNewView">
+            <argument name="selectView" value="New View"/>
+        </actionGroup>
+        <actionGroup ref="AdminEnhancedMediaGalleryAssertActiveFiltersActionGroup" stepKey="assertFilterApplied">
+            <argument name="resultValue" value="{{AdminMediaGalleryFolderData.name}}"/>
+        </actionGroup>
+    </test>
+</tests>

app/code/Magento/MediaGalleryUi/view/adminhtml/web/js/directory/directoryTree.js

@@ -26,7 +26,7 @@ define([
                 filterChips: '${ $.filterChipsProvider }'
             },
             listens: {
-                '${ $.provider }:params.filters.path': 'clearFiltersHandle'
+                '${ $.provider }:params.filters.path': 'updateSelectedDirectory'
             },
             viewConfig: [{
                 component: 'Magento_MediaGalleryUi/js/directory/directories',
@@ -220,7 +220,7 @@ define([
                                 this.firejsTreeEvents();
                             }.bind(this));
                         } else {
-                            this.checkChipFiltersState();
+                            this.updateSelectedDirectory();
                         }
                     }.bind(this));
                 }.bind(this));
@@ -239,19 +239,24 @@ define([
             }.bind(this));
 
             $(this.directoryTreeSelector).on('loaded.jstree', function () {
-                this.checkChipFiltersState();
+                this.updateSelectedDirectory();
             }.bind(this));
 
         },
 
         /**
          * Verify directory filter on init event, select folder per directory filter state
          */
-        checkChipFiltersState: function () {
+        updateSelectedDirectory: function () {
             var currentFilterPath = this.filterChips().filters.path,
                 isMediaBrowser = !_.isUndefined(window.MediabrowserUtility),
                 currentTreePath;
 
+            if (_.isUndefined(currentFilterPath)) {
+                this.clearFiltersHandle();
+                return;
+            }
+
             currentTreePath = this.isFiltersApplied(currentFilterPath) || !isMediaBrowser ? currentFilterPath :
                 Base64.idDecode(window.MediabrowserUtility.pathId);
 
@@ -281,8 +286,7 @@ define([
          * @param {String} currentFilterPath
          */
         isFiltersApplied: function (currentFilterPath) {
-            return !_.isUndefined(currentFilterPath) && currentFilterPath !== '' &&
-                currentFilterPath !== 'wysiwyg' && currentFilterPath !== 'catalog/category';
+            return !_.isUndefined(currentFilterPath) && currentFilterPath !== '';
         },
 
         /**
@@ -303,14 +307,12 @@ define([
         },
 
         /**
-         * Listener to clear filters event
+         * Clear filters
          */
         clearFiltersHandle: function () {
-            if (_.isUndefined(this.filterChips().filters.path)) {
-                $(this.directoryTreeSelector).jstree('deselect_all');
-                this.activeNode(null);
-                this.directories().setInActive();
-            }
+            $(this.directoryTreeSelector).jstree('deselect_all');
+            this.activeNode(null);
+            this.directories().setInActive();
         },
 
         /**