diff --git a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeContextMenuService.ts b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeContextMenuService.ts
index 17da25ea3f..1a6c56478d 100644
--- a/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeContextMenuService.ts
+++ b/webapp/packages/plugin-navigation-tree/src/NodesManager/NavNodeContextMenuService.ts
@@ -56,13 +56,20 @@ export class NavNodeContextMenuService extends Bootstrap {
 
       const nodes = ResourceKeyUtils
         .mapArray(data, nodeId => this.navNodeInfoResource.get(nodeId))
-        .filter<NavNode>(Boolean as any)
-        .map(node => node.name)
-        .join(', ');
+        .filter<NavNode>(Boolean as any);
+
+      const name = nodes.map(node => node.name).join(', ');
+      const folder = nodes.some(node => node.folder);
+
+      let message: string = this.localizationService.translate('app_navigationTree_node_delete_confirmation', undefined, { name });
+
+      if (folder) {
+        message = message + '\n' + this.localizationService.translate('app_navigationTree_node_folder_delete_confirmation');
+      }
 
       const result = await this.commonDialogService.open(ConfirmationDialogDelete, {
         title: 'ui_data_delete_confirmation',
-        message: this.localizationService.translate('app_navigationTree_node_delete_confirmation', undefined, { name: nodes }),
+        message,
         confirmActionText: 'ui_delete',
       });
 
diff --git a/webapp/packages/plugin-navigation-tree/src/locales/en.ts b/webapp/packages/plugin-navigation-tree/src/locales/en.ts
index fa557c64e1..3216dc3b02 100644
--- a/webapp/packages/plugin-navigation-tree/src/locales/en.ts
+++ b/webapp/packages/plugin-navigation-tree/src/locales/en.ts
@@ -13,6 +13,7 @@ export default [
   ['app_navigationTree_settings_folders_title', 'Folders'],
   ['app_navigationTree_settings_folders_description', 'Open any node as tree root node'],
   ['app_navigationTree_node_delete_confirmation', 'You\'re going to delete "{arg:name}". Are you sure?'],
+  ['app_navigationTree_node_folder_delete_confirmation', 'All content in the selected folder will be deleted.'],
   ['app_navigationTree_node_delete_error', 'Failed to delete "{arg:name}'],
   ['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
   ['app_navigationTree_node_empty', 'Empty'],
diff --git a/webapp/packages/plugin-navigation-tree/src/locales/it.ts b/webapp/packages/plugin-navigation-tree/src/locales/it.ts
index b555704d66..ac69bcee38 100644
--- a/webapp/packages/plugin-navigation-tree/src/locales/it.ts
+++ b/webapp/packages/plugin-navigation-tree/src/locales/it.ts
@@ -9,6 +9,7 @@ export default [
   ['app_navigationTree_settings_filter_all_title', 'Show collapsed'],
   ['app_navigationTree_settings_filter_all_description', 'Shows filtered elements in collapsed folders'],
   ['app_navigationTree_node_delete_confirmation', 'You\'re going to delete "{arg:name}". Are you sure?'],
+  ['app_navigationTree_node_folder_delete_confirmation', 'All content in the selected folder will be deleted.'],
   ['app_navigationTree_node_delete_error', 'Failed to delete "{arg:name}'],
   ['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
   ['app_navigationTree_settings_state_title', 'Save tree state'],
diff --git a/webapp/packages/plugin-navigation-tree/src/locales/ru.ts b/webapp/packages/plugin-navigation-tree/src/locales/ru.ts
index 789dcb9720..d4a7467eea 100644
--- a/webapp/packages/plugin-navigation-tree/src/locales/ru.ts
+++ b/webapp/packages/plugin-navigation-tree/src/locales/ru.ts
@@ -15,6 +15,7 @@ export default [
   ['app_navigationTree_settings_folders_title', 'Папки'],
   ['app_navigationTree_settings_folders_description', 'Позволяет открыть любой узел как начальный'],
   ['app_navigationTree_node_delete_confirmation', 'Вы собираетесь удалить "{arg:name}". Вы уверены?'],
+  ['app_navigationTree_node_folder_delete_confirmation', 'Все содержимое выбранной папки будет удалено.'],
   ['app_navigationTree_node_delete_error', 'Ошибка удаления "{arg:name}'],
   ['app_navigationTree_node_rename_error', 'Ошибка переименования ноды'],
 
diff --git a/webapp/packages/plugin-navigation-tree/src/locales/zh.ts b/webapp/packages/plugin-navigation-tree/src/locales/zh.ts
index d9de07f1ac..8e3f614b2d 100644
--- a/webapp/packages/plugin-navigation-tree/src/locales/zh.ts
+++ b/webapp/packages/plugin-navigation-tree/src/locales/zh.ts
@@ -12,6 +12,7 @@ export default [
   ['app_navigationTree_settings_folders_title', 'Folders'],
   ['app_navigationTree_settings_folders_description', 'Open any node as tree root node'],
   ['app_navigationTree_node_delete_confirmation', 'You\'re going to delete "{arg:name}". Are you sure?'],
+  ['app_navigationTree_node_folder_delete_confirmation', 'All content in the selected folder will be deleted.'],
   ['app_navigationTree_node_delete_error', 'Failed to delete "{arg:name}'],
   ['app_navigationTree_node_rename_error', 'Error occurred while renaming'],
   ['app_navigationTree_node_empty', 'Empty'],
diff --git a/webapp/packages/plugin-resource-manager/src/NavNodes/ResourceFoldersBootstrap.ts b/webapp/packages/plugin-resource-manager/src/NavNodes/ResourceFoldersBootstrap.ts
index 4156497430..b791d276d9 100644
--- a/webapp/packages/plugin-resource-manager/src/NavNodes/ResourceFoldersBootstrap.ts
+++ b/webapp/packages/plugin-resource-manager/src/NavNodes/ResourceFoldersBootstrap.ts
@@ -35,7 +35,6 @@ import { ResourcesProjectsNavNodeService } from './ResourcesProjectsNavNodeServi
 interface ITargetNode {
   projectId: string;
   folderId?: string;
-
   projectNodeId: string;
   selectProject: boolean;
 }
@@ -109,6 +108,7 @@ export class ResourceFoldersBootstrap extends Bootstrap {
       },
     });
   }
+
   load(): void | Promise<void> { }
 
   private async moveResourceToFolder(