diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyEditorTab.test.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyEditorTab.test.tsx
index cb239d1680370..e1f85519e7e72 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyEditorTab.test.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyEditorTab.test.tsx
@@ -22,11 +22,28 @@ import userEvent from '@testing-library/user-event';
 import { vi } from 'vitest';
 import { PropertyEditorTab } from './PropertyEditorTab';
 import { usePropertyEditor } from '~/features/property-editor/hooks/usePropertyEditor';
+import { useSchedulerStore } from '~/stores/schedulerStore';
 import type { QueueInfo, PropertyDescriptor } from '~/types';
 
 // Mock the hooks
 vi.mock('~/features/property-editor/hooks/usePropertyEditor');
 
+// Mock the scheduler store
+vi.mock('~/stores/schedulerStore', () => ({
+  useSchedulerStore: vi.fn((selector: any) => {
+    const state = {
+      getGlobalPropertyValue: vi.fn().mockReturnValue({ value: '' }),
+      getQueuePropertyValue: vi.fn().mockReturnValue({ value: '' }),
+      stagedChanges: [],
+      configData: new Map(),
+      schedulerData: null,
+      hasPendingDeletion: vi.fn().mockReturnValue(false),
+      revertQueueDeletion: vi.fn(),
+    };
+    return selector ? selector(state) : state;
+  }),
+}));
+
 // Mock toast
 vi.mock('sonner', () => ({
   toast: {
@@ -161,6 +178,28 @@ describe('PropertyEditorTab', () => {
     expect(within(capacityTrigger).getByText('1')).toBeInTheDocument();
   });
 
+  describe('pending deletion state', () => {
+    it('should not show deletion banner in PropertyEditorTab (banner is in PropertyPanel)', () => {
+      vi.mocked(useSchedulerStore).mockImplementation((selector: any) => {
+        const state = {
+          getGlobalPropertyValue: vi.fn().mockReturnValue({ value: '' }),
+          getQueuePropertyValue: vi.fn().mockReturnValue({ value: '' }),
+          stagedChanges: [],
+          configData: new Map(),
+          schedulerData: null,
+          hasPendingDeletion: vi.fn().mockReturnValue(true),
+          revertQueueDeletion: vi.fn(),
+        };
+        return selector ? selector(state) : state;
+      });
+
+      render(<PropertyEditorTab queue={mockQueue} />);
+
+      expect(screen.queryByText(/marked for deletion/i)).not.toBeInTheDocument();
+      expect(screen.queryByRole('button', { name: /undo delete/i })).not.toBeInTheDocument();
+    });
+  });
+
   it('renders template configuration button when controls allow management', async () => {
     const templateProperty = {
       name: 'auto-queue-creation-v2.enabled',
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyEditorTab.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyEditorTab.tsx
index e99db039d45a1..150f07438d4c8 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyEditorTab.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyEditorTab.tsx
@@ -26,8 +26,6 @@ import {
   AccordionItem,
   AccordionTrigger,
 } from '~/components/ui/accordion';
-import { Alert, AlertDescription } from '~/components/ui/alert';
-import { AlertTriangle } from 'lucide-react';
 import { usePropertyEditor } from '~/features/property-editor/hooks/usePropertyEditor';
 import { PropertyFormField } from './PropertyFormField';
 import type { QueueInfo } from '~/types';
@@ -364,18 +362,6 @@ export const PropertyEditorTab = ({
   return (
     <Form {...form}>
       <div className="flex flex-col h-full">
-        {/* Warning banner for queues pending deletion */}
-        {isPendingDeletion && (
-          <div className="p-4 pb-0">
-            <Alert variant="destructive">
-              <AlertTriangle className="h-4 w-4" />
-              <AlertDescription>
-                This queue is pending deletion and will be removed when changes are applied.
-              </AlertDescription>
-            </Alert>
-          </div>
-        )}
-
         {/* Loading State */}
         {isFormInitializing && (
           <div className="flex justify-center items-center min-h-[200px] p-4">
@@ -436,7 +422,7 @@ export const PropertyEditorTab = ({
                               property={prop}
                               control={control}
                               stagedStatus={getStagedStatus(prop.originalName || prop.name)}
-                              isEnabled={propertyState?.enabled ?? true}
+                              isEnabled={(propertyState?.enabled ?? true) && !isPendingDeletion}
                               onBlur={handleFieldBlur}
                               errors={getFieldErrors(prop.formFieldName || prop.name)}
                               warnings={getFieldWarnings(prop.formFieldName || prop.name)}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyPanel.test.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyPanel.test.tsx
index c3bd2bb5f4c56..763e2ebe4ad5a 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyPanel.test.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyPanel.test.tsx
@@ -24,6 +24,7 @@ import userEvent from '@testing-library/user-event';
 import { useSchedulerStore } from '~/stores/schedulerStore';
 import type { SchedulerStore } from '~/stores/schedulerStore';
 import type { QueueInfo } from '~/types';
+import { SPECIAL_VALUES } from '~/types/constants/special-values';
 import { toast } from 'sonner';
 
 // Test helper
@@ -147,6 +148,8 @@ function getBaseStoreState(): Partial<SchedulerStore> {
     stagedChanges: [],
     configData: new Map<string, string>(),
     schedulerData: null,
+    hasPendingDeletion: vi.fn().mockReturnValue(false),
+    revertQueueDeletion: vi.fn(),
     shouldOpenTemplateConfig: false,
     requestTemplateConfigOpen: () => {
       storeState = { ...storeState, shouldOpenTemplateConfig: true };
@@ -542,4 +545,59 @@ describe('PropertyPanel', () => {
     // Would need to set isSubmitting state through the PropertyEditorTab callbacks
     // This is tested through integration tests
   });
+
+  describe('pending deletion state', () => {
+    it('should hide Stage Changes and Reset buttons when queue is pending deletion', async () => {
+      const user = userEvent.setup();
+      setStoreState({
+        selectedQueuePath: 'root.default',
+        isPropertyPanelOpen: true,
+        stagedChanges: [
+          {
+            id: 'removal-1',
+            queuePath: 'root.default',
+            property: SPECIAL_VALUES.QUEUE_MARKER,
+            type: 'remove',
+            oldValue: 'exists',
+            newValue: undefined,
+          },
+        ] as any,
+        revertQueueDeletion: vi.fn(),
+      });
+      mockGetQueueByPath.mockReturnValue(mockQueue);
+
+      render(<PropertyPanel />);
+
+      // Switch to settings tab to verify buttons are hidden
+      const settingsTab = screen.getByRole('tab', { name: /settings/i });
+      await user.click(settingsTab);
+
+      expect(screen.queryByText('Stage Changes')).not.toBeInTheDocument();
+      expect(screen.queryByText('Reset')).not.toBeInTheDocument();
+    });
+
+    it('should show deletion badge and undo button when queue is pending deletion', () => {
+      setStoreState({
+        selectedQueuePath: 'root.default',
+        isPropertyPanelOpen: true,
+        stagedChanges: [
+          {
+            id: 'removal-1',
+            queuePath: 'root.default',
+            property: SPECIAL_VALUES.QUEUE_MARKER,
+            type: 'remove',
+            oldValue: 'exists',
+            newValue: undefined,
+          },
+        ] as any,
+        revertQueueDeletion: vi.fn(),
+      });
+      mockGetQueueByPath.mockReturnValue(mockQueue);
+
+      render(<PropertyPanel />);
+
+      expect(screen.getByText(/marked for deletion/i)).toBeInTheDocument();
+      expect(screen.getByRole('button', { name: /undo/i })).toBeInTheDocument();
+    });
+  });
 });
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyPanel.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyPanel.tsx
index 7a78f72e768d2..daa84a4e0d5fd 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyPanel.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/property-editor/components/PropertyPanel.tsx
@@ -18,7 +18,7 @@
 
 
 import React, { useReducer, useState, useEffect, useRef } from 'react';
-import { Save, RotateCcw, GitBranch, Info, Settings, Edit, AlertTriangle } from 'lucide-react';
+import { Save, RotateCcw, GitBranch, Info, Settings, Edit, AlertTriangle, Undo2, Trash2 } from 'lucide-react';
 import { useShallow } from 'zustand/react/shallow';
 import { useSchedulerStore } from '~/stores/schedulerStore';
 import { Sheet, SheetContent, SheetHeader, SheetTitle } from '~/components/ui/sheet';
@@ -110,6 +110,7 @@ export const PropertyPanel: React.FC = () => {
   const selectQueue = useSchedulerStore((s) => s.selectQueue);
   const clearTemplateConfigRequest = useSchedulerStore((s) => s.clearTemplateConfigRequest);
   const getQueuePropertyValue = useSchedulerStore((s) => s.getQueuePropertyValue);
+  const revertQueueDeletion = useSchedulerStore((s) => s.revertQueueDeletion);
 
   const [formState, dispatch] = useReducer(formReducer, INITIAL_FORM_STATE);
   const { hasChanges, isFormDirty } = formState;
@@ -282,6 +283,10 @@ export const PropertyPanel: React.FC = () => {
     }
   }, [isPropertyPanelOpen]);
 
+  const isPendingDeletion = selectedQueuePath
+    ? stagedChanges.some((c) => c.queuePath === selectedQueuePath && c.type === 'remove')
+    : false;
+
   const queuePath = selectedQueue?.queuePath;
 
   const queueIssues = !queuePath ? {} : (validationState[queuePath] ?? {});
@@ -308,7 +313,7 @@ export const PropertyPanel: React.FC = () => {
 
   // Keyboard shortcuts - only active when panel is open and on settings tab
   useKeyboardShortcuts(
-    isPanelVisible && tabValue === 'settings'
+    isPanelVisible && tabValue === 'settings' && !isPendingDeletion
       ? [
           {
             key: 's',
@@ -366,13 +371,34 @@ export const PropertyPanel: React.FC = () => {
                     issues={issueList}
                     onIssueSelect={handleIssueSelect}
                   />
-                  {isFormDirty && (
+                  {isPendingDeletion && (
+                    <>
+                      <Badge
+                        variant="outline"
+                        className="text-xs border-amber-500/50 bg-amber-50 text-amber-700 dark:bg-amber-950 dark:text-amber-400 dark:border-amber-500/30"
+                      >
+                        <Trash2 className="h-3 w-3 mr-1" />
+                        Marked for deletion
+                      </Badge>
+                      <Button
+                        type="button"
+                        variant="ghost"
+                        size="sm"
+                        className="h-5 px-1.5 text-xs text-muted-foreground hover:text-foreground"
+                        onClick={() => revertQueueDeletion(selectedQueue.queuePath)}
+                      >
+                        <Undo2 className="h-3 w-3 mr-0.5" />
+                        Undo
+                      </Button>
+                    </>
+                  )}
+                  {!isPendingDeletion && isFormDirty && (
                     <Badge variant="outline" className="text-xs">
                       <Edit className="h-3 w-3 mr-1" />
                       Unsaved
                     </Badge>
                   )}
-                  {!isFormDirty && hasChanges && (
+                  {!isPendingDeletion && !isFormDirty && hasChanges && (
                     <Badge variant="default" className="text-xs">
                       <Edit className="h-3 w-3 mr-1" />
                       Staged
@@ -444,7 +470,7 @@ export const PropertyPanel: React.FC = () => {
             </Tabs>
 
             {/* Fixed Apply/Reset buttons - show on Settings tab */}
-            {tabValue === 'settings' && (
+            {tabValue === 'settings' && !isPendingDeletion && (
               <div className="sticky bottom-0 left-0 right-0 mt-auto p-4 bg-background border-t flex gap-2 justify-end">
                 <Button
                   variant="outline"
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardContextMenu.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardContextMenu.tsx
index 14632afd7448f..2fcfcd60a078c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardContextMenu.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardContextMenu.tsx
@@ -32,7 +32,7 @@ import {
   ContextMenuTrigger,
 } from '~/components/ui/context-menu';
 import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '~/components/ui/tooltip';
-import { Plus, Trash2, Edit, Play, Pause, SlidersHorizontal, FileCog } from 'lucide-react';
+import { Plus, Trash2, Edit, Play, Pause, SlidersHorizontal, FileCog, Undo2 } from 'lucide-react';
 import { QUEUE_STATES, SPECIAL_VALUES } from '~/types';
 
 type StagedStatus = 'new' | 'modified' | 'deleted';
@@ -55,6 +55,7 @@ interface QueueCardContextMenuProps {
   onToggleState: () => void;
   onAddChild: (event: React.MouseEvent) => void;
   onDelete: (event: React.MouseEvent) => void;
+  onUndoDelete: () => void;
   onRemoveStaged: (event: React.MouseEvent) => void;
   onOpenChange: (open: boolean) => void;
 }
@@ -77,6 +78,7 @@ export const QueueCardContextMenu: React.FC<QueueCardContextMenuProps> = ({
   onToggleState,
   onAddChild,
   onDelete,
+  onUndoDelete,
   onRemoveStaged,
   onOpenChange,
 }) => {
@@ -99,7 +101,7 @@ export const QueueCardContextMenu: React.FC<QueueCardContextMenuProps> = ({
           e.stopPropagation();
           onEditProperties(e);
         }}
-        disabled={stagedStatus === 'new' || isAutoCreatedQueue}
+        disabled={stagedStatus === 'new' || isAutoCreatedQueue || hasPendingDeletion}
       >
         <Edit className="mr-2 h-4 w-4" />
         Edit Properties
@@ -111,7 +113,7 @@ export const QueueCardContextMenu: React.FC<QueueCardContextMenuProps> = ({
             e.stopPropagation();
             onManageTemplate(e);
           }}
-          disabled={isTemplateActionDisabled}
+          disabled={isTemplateActionDisabled || hasPendingDeletion}
         >
           <FileCog className="mr-2 h-4 w-4" />
           Manage Template Properties
@@ -119,7 +121,7 @@ export const QueueCardContextMenu: React.FC<QueueCardContextMenuProps> = ({
       )}
 
       {!isRoot && (
-        <ContextMenuItem onClick={(e) => onEditCapacity(e)}>
+        <ContextMenuItem onClick={(e) => onEditCapacity(e)} disabled={hasPendingDeletion}>
           <SlidersHorizontal className="mr-2 h-4 w-4" />
           Edit Capacity
         </ContextMenuItem>
@@ -137,7 +139,7 @@ export const QueueCardContextMenu: React.FC<QueueCardContextMenuProps> = ({
           e.stopPropagation();
           onToggleState();
         }}
-        disabled={!canToggleState}
+        disabled={!canToggleState || hasPendingDeletion}
       >
         {isRunning ? (
           <>
@@ -176,7 +178,7 @@ export const QueueCardContextMenu: React.FC<QueueCardContextMenuProps> = ({
         </TooltipProvider>
       )}
 
-      {canDelete && stagedStatus !== 'new' && (
+      {canDelete && stagedStatus !== 'new' && !hasPendingDeletion && (
         <>
           <ContextMenuSeparator />
           <ContextMenuItem
@@ -187,7 +189,22 @@ export const QueueCardContextMenu: React.FC<QueueCardContextMenuProps> = ({
             className="text-red-600 focus:text-red-600"
           >
             <Trash2 className="mr-2 h-4 w-4" />
-            Delete Queue
+            Mark for Deletion
+          </ContextMenuItem>
+        </>
+      )}
+
+      {hasPendingDeletion && (
+        <>
+          <ContextMenuSeparator />
+          <ContextMenuItem
+            onClick={(e) => {
+              e.stopPropagation();
+              onUndoDelete();
+            }}
+          >
+            <Undo2 className="mr-2 h-4 w-4" />
+            Undo Delete
           </ContextMenuItem>
         </>
       )}
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardNode.test.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardNode.test.tsx
index 016dd5f1eb384..8620262ea05ce 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardNode.test.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardNode.test.tsx
@@ -132,6 +132,7 @@ describe('QueueCardNode', () => {
         hasPendingDeletion: vi.fn().mockReturnValue(false),
         clearQueueChanges: vi.fn(),
         requestTemplateConfigOpen: vi.fn(),
+        revertQueueDeletion: vi.fn(),
       };
       return selector ? selector(state) : state;
     });
@@ -755,4 +756,44 @@ describe('QueueCardNode', () => {
       expect(startQueueItem).not.toHaveAttribute('data-disabled');
     });
   });
+
+  it('should show "Undo Delete" instead of "Mark for Deletion" when queue has pending deletion', async () => {
+    (useSchedulerStore as any).mockImplementation((selector: any) => {
+      const state = {
+        comparisonQueues: [],
+        selectedQueuePath: null,
+        selectQueue: mockSelectQueue,
+        setPropertyPanelOpen: mockSetPropertyPanelOpen,
+        isPropertyPanelOpen: false,
+        propertyPanelInitialTab: 'overview' as const,
+        setPropertyPanelInitialTab: mockSetPropertyPanelInitialTab,
+        toggleComparisonQueue: mockToggleComparisonQueue,
+        getQueueByPath: vi.fn().mockReturnValue({ queueName: 'default' }),
+        getChildQueues: vi.fn().mockReturnValue([]),
+        selectedNodeLabelFilter: '',
+        getQueueLabelCapacity: vi.fn().mockReturnValue({
+          capacity: '10',
+          maxCapacity: '100',
+          absoluteCapacity: '10',
+          isLabelSpecific: false,
+          label: 'DEFAULT',
+          hasAccess: true,
+          canUseLabel: true,
+        }),
+        hasPendingDeletion: vi.fn().mockReturnValue(true),
+        clearQueueChanges: vi.fn(),
+        requestTemplateConfigOpen: vi.fn(),
+        revertQueueDeletion: vi.fn(),
+      };
+      return selector ? selector(state) : state;
+    });
+
+    renderWithProviders(<QueueCardNode {...createNodeProps(defaultNodeData)} />);
+
+    const card = screen.getByText('default');
+    await userEvent.pointer({ keys: '[MouseRight]', target: card });
+
+    expect(screen.queryByText('Mark for Deletion')).not.toBeInTheDocument();
+    expect(screen.getByText('Undo Delete')).toBeInTheDocument();
+  });
 });
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardNode.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardNode.tsx
index 233711329aead..be32eee052179 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardNode.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueCardNode.tsx
@@ -76,7 +76,12 @@ export const QueueCardNode: React.FC<NodeProps> = ({ data }) => {
 
   // Actions (stable references, never trigger re-renders)
   const getQueueLabelCapacity = useSchedulerStore((s) => s.getQueueLabelCapacity);
-  const hasPendingDeletion = useSchedulerStore((s) => s.hasPendingDeletion);
+  const revertQueueDeletion = useSchedulerStore((state) => state.revertQueueDeletion);
+
+  // Derived state (re-renders when deletion status changes)
+  const isPendingDeletion = useSchedulerStore((s) =>
+    s.hasPendingDeletion((data as QueueCardData).queuePath),
+  );
 
   const { canAddChildQueue, canDeleteQueue } = useQueueActions();
 
@@ -304,7 +309,7 @@ export const QueueCardNode: React.FC<NodeProps> = ({ data }) => {
         isTemplateManageable={isTemplateManageable}
         canAdd={canAdd}
         canDelete={canDelete}
-        hasPendingDeletion={hasPendingDeletion(queuePath)}
+        hasPendingDeletion={isPendingDeletion}
         isSelectedQueue={isSelectedQueue}
         isPropertyPanelOpen={isPropertyPanelOpen}
         onEditProperties={(e) => openPropertyPanel(e, 'settings')}
@@ -313,6 +318,7 @@ export const QueueCardNode: React.FC<NodeProps> = ({ data }) => {
         onToggleState={handleToggleState}
         onAddChild={() => setAddDialogOpen(true)}
         onDelete={() => setDeleteDialogOpen(true)}
+        onUndoDelete={() => revertQueueDeletion(queuePath)}
         onRemoveStaged={handleRemoveStagedQueue}
         onOpenChange={handleContextMenuOpenChange}
       >
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueVisualizationContainer.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueVisualizationContainer.tsx
index 3600fa0f9d98a..ddcbcf2e94480 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueVisualizationContainer.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/QueueVisualizationContainer.tsx
@@ -219,7 +219,7 @@ const FlowInner: React.FC = () => {
             <AlertDescription>
               <span>
                 Filtering by partition: <strong>{selectedNodeLabelFilter}</strong>. Queues without
-                access are shown in gray.
+                configured capacity are shown in gray.
               </span>
             </AlertDescription>
           </Alert>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/dialogs/DeleteQueueDialog.test.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/dialogs/DeleteQueueDialog.test.tsx
index 1c9c1ec8d4e63..7600823f077d9 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/dialogs/DeleteQueueDialog.test.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/dialogs/DeleteQueueDialog.test.tsx
@@ -50,13 +50,13 @@ describe('DeleteQueueDialog', () => {
     render(<DeleteQueueDialog open={true} queuePath="root.production.team1" onClose={vi.fn()} />);
 
     expect(screen.getByRole('dialog')).toBeInTheDocument();
-    expect(screen.getByRole('heading', { name: /delete queue/i })).toBeInTheDocument();
-    expect(screen.getByText(/Are you sure you want to delete the queue/)).toBeInTheDocument();
-    // Queue name appears twice: in the prompt and in the confirmation label
-    expect(screen.getAllByText('team1')).toHaveLength(2);
-    expect(screen.getByText(/This action cannot be undone/)).toBeInTheDocument();
-    // Confirmation input should exist
-    expect(screen.getByLabelText(/Type.*team1.*to confirm/)).toBeInTheDocument();
+    expect(screen.getByRole('heading', { name: /mark for deletion/i })).toBeInTheDocument();
+    expect(screen.getByText(/Are you sure you want to mark the queue/)).toBeInTheDocument();
+    // Queue name appears once (no longer in confirmation label)
+    expect(screen.getAllByText('team1')).toHaveLength(1);
+    expect(screen.getByText(/will be marked for deletion and removed when you apply/)).toBeInTheDocument();
+    // Confirmation input should NOT exist
+    expect(screen.queryByLabelText(/Type.*team1.*to confirm/)).not.toBeInTheDocument();
   });
 
   it('should stage queue removal on confirmation', async () => {
@@ -65,17 +65,10 @@ describe('DeleteQueueDialog', () => {
 
     render(<DeleteQueueDialog open={true} queuePath="root.production.team1" onClose={onClose} />);
 
-    const deleteButton = screen.getByRole('button', { name: /delete queue/i });
-    // Button should be disabled until confirmation text is entered
-    expect(deleteButton).toBeDisabled();
-
-    // Type the queue name to confirm
-    const confirmInput = screen.getByLabelText(/Type.*team1.*to confirm/);
-    await user.type(confirmInput, 'team1');
-
-    // Now button should be enabled
-    expect(deleteButton).not.toBeDisabled();
-    await user.click(deleteButton);
+    const markButton = screen.getByRole('button', { name: /mark for deletion/i });
+    // Button should be enabled immediately (no confirmation input)
+    expect(markButton).toBeEnabled();
+    await user.click(markButton);
 
     expect(mockDeleteQueue).toHaveBeenCalledWith('root.production.team1');
     expect(onClose).toHaveBeenCalled();
@@ -105,7 +98,7 @@ describe('DeleteQueueDialog', () => {
     expect(screen.getByText(/Please delete all child queues first/)).toBeInTheDocument();
 
     // Delete button should not exist when queue cannot be deleted
-    expect(screen.queryByRole('button', { name: /delete queue/i })).not.toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: /mark for deletion/i })).not.toBeInTheDocument();
   });
 
   it('should handle root queue specially', () => {
@@ -114,7 +107,7 @@ describe('DeleteQueueDialog', () => {
     expect(screen.getByText('The root queue cannot be deleted.')).toBeInTheDocument();
 
     // Root queue should not have a delete button, only cancel
-    expect(screen.queryByRole('button', { name: /delete queue/i })).not.toBeInTheDocument();
+    expect(screen.queryByRole('button', { name: /mark for deletion/i })).not.toBeInTheDocument();
   });
 
   it('should close on escape key', async () => {
@@ -139,16 +132,11 @@ describe('DeleteQueueDialog', () => {
     ).toBeInTheDocument();
   });
 
-  it('should use danger variant for delete button', async () => {
-    const user = userEvent.setup();
+  it('should use default variant for mark button', () => {
     render(<DeleteQueueDialog open={true} queuePath="root.default" onClose={vi.fn()} />);
 
-    // Type confirmation to enable the button for class check
-    const confirmInput = screen.getByLabelText(/Type.*default.*to confirm/);
-    await user.type(confirmInput, 'default');
-
-    const deleteButton = screen.getByRole('button', { name: /delete queue/i });
-    // Destructive buttons use gradient styling
-    expect(deleteButton).toHaveClass('from-destructive');
+    const markButton = screen.getByRole('button', { name: /mark for deletion/i });
+    expect(markButton).toBeEnabled();
+    expect(markButton).not.toHaveClass('from-destructive');
   });
 });
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/dialogs/DeleteQueueDialog.tsx b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/dialogs/DeleteQueueDialog.tsx
index dc50508c1883f..d642fb6fe8eb7 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/dialogs/DeleteQueueDialog.tsx
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/features/queue-management/components/dialogs/DeleteQueueDialog.tsx
@@ -17,7 +17,6 @@
  */
 
 
-import { useState, useEffect } from 'react';
 import {
   Dialog,
   DialogContent,
@@ -27,10 +26,8 @@ import {
   DialogTitle,
 } from '~/components/ui/dialog';
 import { Button } from '~/components/ui/button';
-import { Input } from '~/components/ui/input';
-import { Field, FieldControl, FieldLabel } from '~/components/ui/field';
 import { Alert, AlertDescription } from '~/components/ui/alert';
-import { Trash2, AlertTriangle } from 'lucide-react';
+import { AlertTriangle } from 'lucide-react';
 import { useQueueActions } from '~/features/queue-management/hooks/useQueueActions';
 import { SPECIAL_VALUES } from '~/types';
 
@@ -43,26 +40,16 @@ interface DeleteQueueDialogProps {
 export function DeleteQueueDialog({ open, queuePath, onClose }: DeleteQueueDialogProps) {
   const { deleteQueue, canDeleteQueue } = useQueueActions();
   const queueName = queuePath.split('.').pop() || queuePath;
-  const [confirmText, setConfirmText] = useState('');
 
   const canDelete = canDeleteQueue(queuePath);
   const isRoot = queuePath === SPECIAL_VALUES.ROOT_QUEUE_NAME;
-  const isConfirmationValid = confirmText === queueName;
-
-  // Reset confirmation text when dialog opens/closes
-  useEffect(() => {
-    if (!open) {
-      setConfirmText('');
-    }
-  }, [open]);
 
   const handleDelete = () => {
-    if (!isConfirmationValid) return;
     try {
       deleteQueue(queuePath);
       onClose();
     } catch (error) {
-      console.error('Failed to delete queue:', error);
+      console.error('Failed to mark queue for deletion:', error);
     }
   };
 
@@ -70,11 +57,11 @@ export function DeleteQueueDialog({ open, queuePath, onClose }: DeleteQueueDialo
     <Dialog open={open} onOpenChange={onClose}>
       <DialogContent className="sm:max-w-md" onClick={(e) => e.stopPropagation()}>
         <DialogHeader>
-          <DialogTitle className="flex items-center gap-2 text-red-600">
-            <Trash2 className="h-5 w-5" />
-            Delete Queue
+          <DialogTitle className="flex items-center gap-2 text-amber-600">
+            <AlertTriangle className="h-5 w-5" />
+            Mark for Deletion
           </DialogTitle>
-          <DialogDescription>Remove a queue from the scheduler configuration</DialogDescription>
+          <DialogDescription>Stage a queue for removal from the scheduler configuration</DialogDescription>
         </DialogHeader>
 
         <div className="space-y-4">
@@ -94,29 +81,15 @@ export function DeleteQueueDialog({ open, queuePath, onClose }: DeleteQueueDialo
           ) : (
             <>
               <p className="text-sm">
-                Are you sure you want to delete the queue <strong>{queueName}</strong>?
+                Are you sure you want to mark the queue <strong>{queueName}</strong> for deletion?
               </p>
-              <Alert>
+              <Alert className="border-l-amber-500 [&>svg]:text-amber-600">
                 <AlertTriangle className="h-4 w-4" />
                 <AlertDescription>
-                  This action cannot be undone. The queue and all its configurations will be
-                  removed.
+                  The queue will be marked for deletion and removed when you apply changes. You can
+                  undo this action before applying.
                 </AlertDescription>
               </Alert>
-              <Field>
-                <FieldLabel htmlFor="confirmDelete">
-                  Type <strong>{queueName}</strong> to confirm
-                </FieldLabel>
-                <FieldControl>
-                  <Input
-                    id="confirmDelete"
-                    placeholder={queueName}
-                    value={confirmText}
-                    onChange={(e) => setConfirmText(e.target.value)}
-                    autoComplete="off"
-                  />
-                </FieldControl>
-              </Field>
             </>
           )}
         </div>
@@ -126,9 +99,9 @@ export function DeleteQueueDialog({ open, queuePath, onClose }: DeleteQueueDialo
             Cancel
           </Button>
           {canDelete && !isRoot && (
-            <Button onClick={handleDelete} variant="destructive" disabled={!isConfirmationValid}>
-              <Trash2 className="mr-2 h-4 w-4" />
-              Delete Queue
+            <Button onClick={handleDelete} variant="default">
+              <AlertTriangle className="mr-2 h-4 w-4" />
+              Mark for Deletion
             </Button>
           )}
         </DialogFooter>
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/schedulerStore.test.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/schedulerStore.test.ts
index dac74653707ad..82192f353fd2c 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/schedulerStore.test.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/schedulerStore.test.ts
@@ -796,6 +796,41 @@ describe('schedulerStore', () => {
       });
     });
 
+    describe('revertQueueDeletion', () => {
+      it('should revert a pending queue deletion', () => {
+        const store = createTestStore();
+        store.getState().stageQueueRemoval('root.test');
+
+        expect(store.getState().hasPendingDeletion('root.test')).toBe(true);
+
+        store.getState().revertQueueDeletion('root.test');
+
+        expect(store.getState().hasPendingDeletion('root.test')).toBe(false);
+        expect(store.getState().stagedChanges).toHaveLength(0);
+      });
+
+      it('should not affect other staged changes', () => {
+        const store = createTestStore();
+        store.getState().stageQueueChange('root.other', 'capacity', '50');
+        store.getState().stageQueueRemoval('root.test');
+
+        store.getState().revertQueueDeletion('root.test');
+
+        expect(store.getState().hasPendingDeletion('root.test')).toBe(false);
+        expect(store.getState().stagedChanges).toHaveLength(1);
+        expect(store.getState().stagedChanges[0].queuePath).toBe('root.other');
+      });
+
+      it('should be a no-op if queue has no pending deletion', () => {
+        const store = createTestStore();
+        store.getState().stageQueueChange('root.test', 'capacity', '50');
+
+        store.getState().revertQueueDeletion('root.test');
+
+        expect(store.getState().stagedChanges).toHaveLength(1);
+      });
+    });
+
     describe('clearAllChanges', () => {
       it('should clear all staged changes', () => {
         const store = createTestStore();
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/stagedChangesSlice.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/stagedChangesSlice.ts
index d4b8fe029128d..cd9b02bccc7c1 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/stagedChangesSlice.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/stagedChangesSlice.ts
@@ -542,6 +542,15 @@ export const createStagedChangesSlice: StateCreator<
     return get().stagedChanges.some((c) => c.queuePath === queuePath && c.type === 'remove');
   },
 
+  revertQueueDeletion: (queuePath) => {
+    const removalChange = get().stagedChanges.find(
+      (c) => c.queuePath === queuePath && c.type === 'remove',
+    );
+    if (removalChange) {
+      get().revertChange(removalChange.id);
+    }
+  },
+
   getStagedChangeById: (changeId) => {
     return get().stagedChanges.find((c) => c.id === changeId);
   },
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/types.ts b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/types.ts
index e93656415179a..02fb6b7900115 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/types.ts
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-capacity-scheduler-ui/src/main/webapp/src/stores/slices/types.ts
@@ -94,6 +94,7 @@ export interface StagedChangesSlice {
   ) => void;
   applyChanges: () => Promise<void>;
   revertChange: (changeId: string) => void;
+  revertQueueDeletion: (queuePath: string) => void;
   clearAllChanges: () => void;
   clearQueueChanges: (queuePath: string) => void;
   hasUnsavedChanges: () => boolean;