diff --git a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/index.js b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/index.js
index 66655aa349..0663df0246 100644
--- a/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/components/DisplayedFieldsDropdown/index.js
@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { ButtonDropdown } from 'reactstrap';
 import { FormattedMessage } from 'react-intl';
-import { LayoutIcon } from 'strapi-helper-plugin';
+import { LayoutIcon, useGlobalContext } from 'strapi-helper-plugin';
 import pluginId from '../../pluginId';
 import InputCheckbox from '../InputCheckbox';
 import DropdownItemLink from './DropdownItemLink';
@@ -21,6 +21,8 @@ const DisplayedFieldsDropdown = ({
   slug,
   toggle,
 }) => {
+  const { emitEvent } = useGlobalContext();
+
   return (
     <DropdownWrapper>
       <ButtonDropdown isOpen={isOpen} toggle={toggle} direction="down">
@@ -28,7 +30,10 @@ const DisplayedFieldsDropdown = ({
         <Toggle isopen={isOpen.toString()} />
         <MenuDropdown isopen={isOpen.toString()}>
           <DropdownItemLink>
-            <LayoutWrapper to={`${slug}/ctm-configurations/list-settings`}>
+            <LayoutWrapper
+              to={`${slug}/ctm-configurations/list-settings`}
+              onClick={() => emitEvent('willEditListLayout')}
+            >
               <LayoutIcon />
               <FormattedMessage id="app.links.configure-view" />
             </LayoutWrapper>
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js
index f9ec52bcc4..9d70bf0dc4 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditSettingsView/index.js
@@ -187,16 +187,12 @@ const EditSettingsView = ({
       delete body.uid;
       delete body.isComponent;
 
-      emitEvent('willSaveContentTypeLayout');
-
       await request(getRequestUrl(`${type}/${slug || componentSlug}`), {
         method: 'PUT',
         body,
         signal,
       });
 
-      emitEvent('didSaveContentTypeLayout');
-
       dispatch({
         type: 'SUBMIT_SUCCEEDED',
       });
@@ -209,7 +205,7 @@ const EditSettingsView = ({
         deleteLayouts();
       }
 
-      emitEvent('didSaveContentTypeLayout');
+      emitEvent('didEditEditSettings');
     } catch (err) {
       strapi.notification.error('notification.error');
     }
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
index 5506da7615..dc56dad35d 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/EditViewDataManagerProvider/index.js
@@ -42,6 +42,8 @@ const EditViewDataManagerProvider = ({
   const { signal } = abortController;
   const isCreatingEntry = id === 'create';
 
+  const { emitEvent } = useGlobalContext();
+
   useEffect(() => {
     if (!isLoading) {
       checkFormErrors();
@@ -111,6 +113,7 @@ const EditViewDataManagerProvider = ({
     componentUid,
     shouldCheckErrors = false
   ) => {
+    emitEvent('addComponentToDynamicZone');
     dispatch({
       type: 'ADD_COMPONENT_TO_DYNAMIC_ZONE',
       keys: keys.split('.'),
@@ -188,8 +191,6 @@ const EditViewDataManagerProvider = ({
     });
   };
 
-  const { emitEvent } = useGlobalContext();
-
   const handleSubmit = async e => {
     e.preventDefault();
 
@@ -270,6 +271,7 @@ const EditViewDataManagerProvider = ({
   };
 
   const moveComponentDown = (dynamicZoneName, currentIndex) => {
+    emitEvent('changeComponentsOrder');
     dispatch({
       type: 'MOVE_COMPONENT_DOWN',
       dynamicZoneName,
@@ -277,6 +279,7 @@ const EditViewDataManagerProvider = ({
     });
   };
   const moveComponentUp = (dynamicZoneName, currentIndex) => {
+    emitEvent('changeComponentsOrder');
     dispatch({
       type: 'MOVE_COMPONENT_UP',
       dynamicZoneName,
@@ -309,6 +312,7 @@ const EditViewDataManagerProvider = ({
   };
 
   const removeComponentFromDynamicZone = (dynamicZoneName, index) => {
+    emitEvent('removeComponentFromDynamicZone');
     dispatch({
       type: 'REMOVE_COMPONENT_FROM_DYNAMIC_ZONE',
       dynamicZoneName,
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/index.js
index d4330e7a80..ef0c6ebff3 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListSettingsView/index.js
@@ -151,7 +151,7 @@ const ListSettingsView = ({ deleteLayout, models, slug }) => {
         type: 'SUBMIT_SUCCEEDED',
       });
       deleteLayout(slug);
-      emitEvent('didSaveContentTypeLayout');
+      emitEvent('didEditListSettings');
     } catch (err) {
       strapi.notification.error('notification.error');
     }
diff --git a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js
index 59d12ceb59..f4953a3b14 100644
--- a/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js
+++ b/packages/strapi-plugin-content-manager/admin/src/containers/ListView/index.js
@@ -109,12 +109,16 @@ function ListView({
 
   const toggleLabelPickerState = () => {
     if (!isLabelPickerOpen) {
-      emitEvent('willChangeDisplayedFields');
+      emitEvent('willChangeListFieldsSettings');
     }
 
     setLabelPickerState(prevState => !prevState);
   };
   const toggleFilterPickerState = () => {
+    if (!isFilterPickerOpen) {
+      emitEvent('willFilterEntries');
+    }
+
     setFilterPickerState(prevState => !prevState);
   };
 
diff --git a/packages/strapi-plugin-content-manager/admin/src/utils/getComponents.js b/packages/strapi-plugin-content-manager/admin/src/utils/getComponents.js
index 8016389c3e..4158dfcd80 100644
--- a/packages/strapi-plugin-content-manager/admin/src/utils/getComponents.js
+++ b/packages/strapi-plugin-content-manager/admin/src/utils/getComponents.js
@@ -38,7 +38,7 @@ const getInjectedComponents = (
             {...compo.props}
             key={compo.key}
             onClick={() => {
-              emitEvent('willEditContentTypeFromEditView');
+              emitEvent('willEditEditLayout');
             }}
           />
         );