diff --git a/src/Components/AppShell/ContextWrapper.tsx b/src/Components/AppShell/ContextWrapper.tsx
index 50777b63..c4245b52 100644
--- a/src/Components/AppShell/ContextWrapper.tsx
+++ b/src/Components/AppShell/ContextWrapper.tsx
@@ -10,6 +10,7 @@ import { ItemsProvider } from '#components/Map/hooks/useItems'
 import { LayersProvider } from '#components/Map/hooks/useLayers'
 import { LeafletRefsProvider } from '#components/Map/hooks/useLeafletRefs'
 import { PermissionsProvider } from '#components/Map/hooks/usePermissions'
+import { PopupFormProvider } from '#components/Map/hooks/usePopupForm'
 import { SelectPositionProvider } from '#components/Map/hooks/useSelectPosition'
 import { TagsProvider } from '#components/Map/hooks/useTags'
 
@@ -66,22 +67,24 @@ export const Wrappers = ({ children }) => {
                   <QueryClientProvider client={queryClient}>
                     <AppStateProvider>
                       <ClusterRefProvider>
-                        <QuestsProvider initialOpen={true}>
-                          <ToastContainer
-                            position='top-right'
-                            autoClose={2000}
-                            hideProgressBar
-                            newestOnTop={false}
-                            closeOnClick
-                            rtl={false}
-                            pauseOnFocusLoss
-                            draggable
-                            pauseOnHover
-                            theme='light'
-                            closeButton={CloseButton}
-                          />
-                          {children}
-                        </QuestsProvider>
+                        <PopupFormProvider>
+                          <QuestsProvider initialOpen={true}>
+                            <ToastContainer
+                              position='top-right'
+                              autoClose={2000}
+                              hideProgressBar
+                              newestOnTop={false}
+                              closeOnClick
+                              rtl={false}
+                              pauseOnFocusLoss
+                              draggable
+                              pauseOnHover
+                              theme='light'
+                              closeButton={CloseButton}
+                            />
+                            {children}
+                          </QuestsProvider>
+                        </PopupFormProvider>
                       </ClusterRefProvider>
                     </AppStateProvider>
                   </QueryClientProvider>
diff --git a/src/Components/Map/hooks/usePopupForm.tsx b/src/Components/Map/hooks/usePopupForm.tsx
index 236b931f..ef38d3f6 100644
--- a/src/Components/Map/hooks/usePopupForm.tsx
+++ b/src/Components/Map/hooks/usePopupForm.tsx
@@ -22,7 +22,7 @@ interface Props {
   children?: React.ReactNode
 }
 
-export const ClusterRefProvider: React.FunctionComponent<Props> = ({ children }: Props) => (
+export const PopupFormProvider: React.FunctionComponent<Props> = ({ children }: Props) => (
   <PoupFormContext.Provider value={usePopupFormManager()}>{children}</PoupFormContext.Provider>
 )