diff --git a/packages/client/src/store/ContextOptionsStore.js b/packages/client/src/store/ContextOptionsStore.js
index a1780776e9..a231e3dfca 100644
--- a/packages/client/src/store/ContextOptionsStore.js
+++ b/packages/client/src/store/ContextOptionsStore.js
@@ -1073,7 +1073,8 @@ class ContextOptionsStore {
     const { activeFiles, activeFolders } = this.filesStore;
     const isExistActiveItems = [...activeFiles, ...activeFolders].length > 0;
 
-    if (isExistActiveItems || emptyTrashInProgress) return;
+    if (isExistActiveItems || this.filesActionsStore.emptyTrashInProgress)
+      return;
 
     this.dialogsStore.setEmptyTrashDialogVisible(true);
   };
@@ -1197,6 +1198,11 @@ class ContextOptionsStore {
         optionsToRemove,
       );
       item = { ...item, contextOptions };
+    } else {
+      item.contextOptions = this.filesStore.removeOptions(
+        item.contextOptions,
+        optionsToRemove,
+      );
     }
 
     const { contextOptions, isEditing } = item;
diff --git a/packages/shared/components/navigation/Navigation.tsx b/packages/shared/components/navigation/Navigation.tsx
index fff0ff1cf2..507d1361c6 100644
--- a/packages/shared/components/navigation/Navigation.tsx
+++ b/packages/shared/components/navigation/Navigation.tsx
@@ -82,7 +82,7 @@ const Navigation = ({
   onNavigationButtonClick,
   tariffBar,
   showNavigationButton,
-  onContextClick,
+  onContextOptionsClick,
   ...rest
 }: INavigationProps) => {
   const [isOpen, setIsOpen] = React.useState(false);
@@ -292,7 +292,7 @@ const Navigation = ({
               tariffBar={tariffBar}
               title={title}
               isEmptyPage={isEmptyPage}
-              onContextClick={onContextClick}
+              onContextOptionsClick={onContextOptionsClick}
             />
           </StyledContainer>
           {isDesktop && !hideInfoPanel && (
diff --git a/packages/shared/components/navigation/Navigation.types.ts b/packages/shared/components/navigation/Navigation.types.ts
index 751a72bd76..dcf25adc90 100644
--- a/packages/shared/components/navigation/Navigation.types.ts
+++ b/packages/shared/components/navigation/Navigation.types.ts
@@ -203,4 +203,5 @@ export interface INavigationProps {
   onNavigationButtonClick?: () => void;
   tariffBar: React.ReactElement;
   showNavigationButton: boolean;
+  onContextOptionsClick?: () => void;
 }