diff --git a/package-lock.json b/package-lock.json
index 25726709f..bdf6b1da9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.22.3",
+    "version": "1.22.4",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@devtron-labs/devtron-fe-common-lib",
-            "version": "1.22.3",
+            "version": "1.22.4",
             "hasInstallScript": true,
             "license": "ISC",
             "dependencies": {
diff --git a/package.json b/package.json
index f6eab2967..fac8b2739 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@devtron-labs/devtron-fe-common-lib",
-    "version": "1.22.3",
+    "version": "1.22.4",
     "description": "Supporting common component library",
     "type": "module",
     "main": "dist/index.js",
diff --git a/src/Common/Drawer/Drawer.tsx b/src/Common/Drawer/Drawer.tsx
index ca496f290..1ce2fb110 100644
--- a/src/Common/Drawer/Drawer.tsx
+++ b/src/Common/Drawer/Drawer.tsx
@@ -19,7 +19,7 @@ import { VisibleModal } from '../Modals/VisibleModal'
 import './Drawer.scss'
 import { DTFocusTrapType } from '@Shared/Components/DTFocusTrap'
 
-export interface DrawerProps extends Pick<DTFocusTrapType, 'initialFocus'> {
+export interface DrawerProps extends Pick<DTFocusTrapType, 'initialFocus' | 'avoidFocusTrap' > {
     position: 'left' | 'right' | 'bottom' | 'top'
     children?: any
     backdrop?: boolean
@@ -45,6 +45,7 @@ export const Drawer = ({
     onClose,
     disableTransition,
     initialFocus = undefined,
+    avoidFocusTrap = false,
 }: DrawerProps) => {
     const drawerRef = useRef(null)
     useEffect(() => {
@@ -69,6 +70,7 @@ export const Drawer = ({
             onEscape={onEscape}
             close={onClose}
             initialFocus={initialFocus}
+            avoidFocusTrap={avoidFocusTrap}
         >
             <aside
                 style={style}
diff --git a/src/Common/Modals/VisibleModal.tsx b/src/Common/Modals/VisibleModal.tsx
index e4a6f5c18..e3bff4150 100644
--- a/src/Common/Modals/VisibleModal.tsx
+++ b/src/Common/Modals/VisibleModal.tsx
@@ -27,6 +27,7 @@ export class VisibleModal extends React.Component<{
     close?: (e?) => void
     onEscape?: (e?) => void
     initialFocus?: DTFocusTrapType['initialFocus']
+    avoidFocusTrap?: boolean
 }> {
     constructor(props) {
         super(props)
@@ -56,6 +57,7 @@ export class VisibleModal extends React.Component<{
                 onEscape={this.escFunction}
                 onClick={this.handleBodyClick}
                 initialFocus={this.props.initialFocus ?? undefined}
+                avoidFocusTrap={this.props.avoidFocusTrap}
             >
                 <div className={this.props.parentClassName}>
                     <div className={`visible-modal__body ${this.props.className || ''}`}>{this.props.children}</div>
diff --git a/src/Shared/Components/Backdrop/Backdrop.tsx b/src/Shared/Components/Backdrop/Backdrop.tsx
index 323424d69..8865837de 100644
--- a/src/Shared/Components/Backdrop/Backdrop.tsx
+++ b/src/Shared/Components/Backdrop/Backdrop.tsx
@@ -33,6 +33,7 @@ const Backdrop = ({
     deactivateFocusOnEscape = true,
     initialFocus,
     returnFocusOnDeactivate,
+    avoidFocusTrap,
 }: BackdropProps) => {
     // STATES
     const [portalContainer, setPortalContainer] = useState<HTMLElement | null>(null)
@@ -92,6 +93,7 @@ const Backdrop = ({
             deactivateFocusOnEscape={deactivateFocusOnEscape}
             initialFocus={initialFocus ?? undefined}
             returnFocusOnDeactivate={returnFocusOnDeactivate}
+            avoidFocusTrap={avoidFocusTrap}
         >
             <motion.div
                 initial={{ opacity: 0 }}
diff --git a/src/Shared/Components/Backdrop/types.ts b/src/Shared/Components/Backdrop/types.ts
index fbdb6bd39..ead3332c0 100644
--- a/src/Shared/Components/Backdrop/types.ts
+++ b/src/Shared/Components/Backdrop/types.ts
@@ -19,7 +19,10 @@ import { MouseEvent, ReactNode } from 'react'
 import { DTFocusTrapType } from '../DTFocusTrap'
 
 export interface BackdropProps
-    extends Pick<DTFocusTrapType, 'deactivateFocusOnEscape' | 'initialFocus' | 'onEscape' | 'returnFocusOnDeactivate'> {
+    extends Pick<
+        DTFocusTrapType,
+        'deactivateFocusOnEscape' | 'initialFocus' | 'onEscape' | 'returnFocusOnDeactivate' | 'avoidFocusTrap'
+    > {
     /**
      * The content to be rendered within the backdrop component.
      */
diff --git a/src/Shared/Components/ConfirmationModal/ConfirmationModal.tsx b/src/Shared/Components/ConfirmationModal/ConfirmationModal.tsx
index 9ab7d5cd8..004cbe2b9 100644
--- a/src/Shared/Components/ConfirmationModal/ConfirmationModal.tsx
+++ b/src/Shared/Components/ConfirmationModal/ConfirmationModal.tsx
@@ -46,6 +46,7 @@ const ConfirmationModalBody = ({
     shouldCloseOnEscape = true,
     isLandscapeView = false,
     showConfetti = false,
+    avoidFocusTrap = false,
 }: ConfirmationModalBodyProps) => {
     const { registerShortcut, unregisterShortcut } = useRegisterShortcut()
 
@@ -92,6 +93,7 @@ const ConfirmationModalBody = ({
             deactivateFocusOnEscape={shouldCloseOnEscape}
             // Since when custom input is present, we auto focus on input, else focus on primary button
             initialFocus={confirmationConfig ? false : `#${PRIMARY_BUTTON_ID}`}
+            avoidFocusTrap={avoidFocusTrap}
         >
             <motion.div
                 className={`${isLandscapeView ? 'w-500' : 'w-400'} confirmation-modal border__secondary flexbox-col br-8 bg__primary dc__m-auto mt-40`}
diff --git a/src/Shared/Components/ConfirmationModal/types.ts b/src/Shared/Components/ConfirmationModal/types.ts
index 805868b64..974c34087 100644
--- a/src/Shared/Components/ConfirmationModal/types.ts
+++ b/src/Shared/Components/ConfirmationModal/types.ts
@@ -104,6 +104,7 @@ export type ConfirmationModalProps<isConfig extends boolean = false> = PropsWith
      * @default false
      */
     showConfetti?: boolean
+    avoidFocusTrap?: boolean
 }> &
     ButtonConfigAndVariantType<isConfig> &
     (isConfig extends false
diff --git a/src/Shared/Components/DTFocusTrap/DTFocusTrap.tsx b/src/Shared/Components/DTFocusTrap/DTFocusTrap.tsx
index 3bb280cd2..65bc9b4d1 100644
--- a/src/Shared/Components/DTFocusTrap/DTFocusTrap.tsx
+++ b/src/Shared/Components/DTFocusTrap/DTFocusTrap.tsx
@@ -14,40 +14,22 @@
  * limitations under the License.
  */
 
-import { createContext, useCallback, useContext, useEffect, useMemo, useState } from 'react'
+import { useCallback, useEffect } from 'react'
 import FocusTrap from 'focus-trap-react'
 
-import { noop } from '@Common/Helper'
 import { ALLOW_ACTION_OUTSIDE_FOCUS_TRAP } from '@Shared/constants'
 import { preventBodyScroll } from '@Shared/Helpers'
 
 import { DTFocusTrapType } from './types'
 
-const FocusTrapControlContext = createContext<{
-    disableFocusTrap: () => void
-    resumeFocusTrap: () => void
-}>(null)
-
-export const useFocusTrapControl = () => {
-    const context = useContext(FocusTrapControlContext)
-    if (!context) {
-        return {
-            disableFocusTrap: noop,
-            resumeFocusTrap: noop,
-        }
-    }
-    return context
-}
-
 const DTFocusTrap = ({
     onEscape,
     deactivateFocusOnEscape = true,
     children,
     initialFocus = undefined,
     returnFocusOnDeactivate = true,
+    avoidFocusTrap = false,
 }: DTFocusTrapType) => {
-    const [isFocusEnabled, setIsFocusEnabled] = useState(true)
-
     const handleEscape = useCallback(
         (e?: KeyboardEvent | MouseEvent) => {
             onEscape(e)
@@ -64,40 +46,30 @@ const DTFocusTrap = ({
         }
     }, [])
 
-    const focusContextValue = useMemo(
-        () => ({
-            disableFocusTrap: () => setIsFocusEnabled(false),
-            resumeFocusTrap: () => setIsFocusEnabled(true),
-        }),
-        [],
-    )
-
     return (
-        <FocusTrapControlContext.Provider value={focusContextValue}>
-            <FocusTrap
-                active={isFocusEnabled}
-                focusTrapOptions={{
-                    escapeDeactivates: handleEscape,
-                    initialFocus,
-                    allowOutsideClick: (event) => {
-                        // Allow up to 3 parent levels to check for the allowed class
-                        let el = event.target as Element | null
-                        let depth = 0
-                        while (el && depth < 4) {
-                            if (el.classList && el.classList.contains(ALLOW_ACTION_OUTSIDE_FOCUS_TRAP)) {
-                                return true
-                            }
-                            el = el.parentElement
-                            depth += 1
+        <FocusTrap
+            active={!avoidFocusTrap}
+            focusTrapOptions={{
+                escapeDeactivates: handleEscape,
+                initialFocus,
+                allowOutsideClick: (event) => {
+                    // Allow up to 3 parent levels to check for the allowed class
+                    let el = event.target as Element | null
+                    let depth = 0
+                    while (el && depth < 4) {
+                        if (el.classList && el.classList.contains(ALLOW_ACTION_OUTSIDE_FOCUS_TRAP)) {
+                            return true
                         }
-                        return false
-                    },
-                    returnFocusOnDeactivate,
-                }}
-            >
-                {children}
-            </FocusTrap>
-        </FocusTrapControlContext.Provider>
+                        el = el.parentElement
+                        depth += 1
+                    }
+                    return false
+                },
+                returnFocusOnDeactivate,
+            }}
+        >
+            {children}
+        </FocusTrap>
     )
 }
 
diff --git a/src/Shared/Components/DTFocusTrap/index.tsx b/src/Shared/Components/DTFocusTrap/index.tsx
index d0506f829..488c307f6 100644
--- a/src/Shared/Components/DTFocusTrap/index.tsx
+++ b/src/Shared/Components/DTFocusTrap/index.tsx
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-export { default as DTFocusTrap, useFocusTrapControl } from './DTFocusTrap'
+export { default as DTFocusTrap } from './DTFocusTrap'
 export type { DTFocusTrapType } from './types'
diff --git a/src/Shared/Components/DTFocusTrap/types.ts b/src/Shared/Components/DTFocusTrap/types.ts
index b2ddd5d6b..4da661e49 100644
--- a/src/Shared/Components/DTFocusTrap/types.ts
+++ b/src/Shared/Components/DTFocusTrap/types.ts
@@ -50,4 +50,5 @@ export interface DTFocusTrapType extends Pick<FocusTrapProps['focusTrapOptions']
      * Setting this option to undefined (or to a function that returns undefined) will result in the first element in the focus trap's tab order receiving focus.
      */
     initialFocus?: FocusTargetOrFalse | undefined | (() => void)
+    avoidFocusTrap?: boolean
 }
diff --git a/src/Shared/Components/DatePicker/DateTimePicker.tsx b/src/Shared/Components/DatePicker/DateTimePicker.tsx
index 5b4c22dc6..37e443434 100644
--- a/src/Shared/Components/DatePicker/DateTimePicker.tsx
+++ b/src/Shared/Components/DatePicker/DateTimePicker.tsx
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 import { SingleDatePicker } from 'react-dates'
 import CustomizableCalendarDay from 'react-dates/esm/components/CustomizableCalendarDay'
 import { SelectInstance } from 'react-select'
@@ -28,7 +28,6 @@ import { ComponentSizeType } from '@Shared/constants'
 import 'react-dates/initialize'
 
 import { DATE_TIME_FORMATS } from '../../../Common'
-import { useFocusTrapControl } from '../DTFocusTrap'
 import { SelectPicker } from '../SelectPicker'
 import { customDayStyles, DATE_PICKER_IDS, DATE_PICKER_PLACEHOLDER } from './constants'
 import { DateTimePickerProps } from './types'
@@ -57,8 +56,6 @@ const DateTimePicker = ({
     const selectedTimeOption = DEFAULT_TIME_OPTIONS.find((option) => option.value === time) ?? DEFAULT_TIME_OPTIONS[0]
     const [isFocused, setFocused] = useState(false)
 
-    const { disableFocusTrap, resumeFocusTrap } = useFocusTrapControl()
-
     const handleFocusChange = ({ focused }) => {
         setFocused(focused)
     }
@@ -74,14 +71,6 @@ const DateTimePicker = ({
     // Function to disable dates including today and all past dates
     const isDayBlocked = (day) => isTodayBlocked && !day.isAfter(today)
 
-    useEffect(() => {
-        if (isFocused) {
-            disableFocusTrap()
-            return
-        }
-        resumeFocusTrap()
-    }, [isFocused])
-
     return (
         <div className="date-time-picker">
             {label && (