diff --git a/src/containers/App.tsx b/src/containers/App.tsx
index ee9f2be1..ea207916 100644
--- a/src/containers/App.tsx
+++ b/src/containers/App.tsx
@@ -12,6 +12,7 @@ import { UserContextProvider } from '~/utils/context/UserContextProvider';
 import { SWRConfigProvider } from '~/utils/providers/SWRConfigProvider';
 import { observer } from 'mobx-react';
 import { useGlobalLoader } from '~/hooks/dom/useGlobalLoader';
+import { SearchProvider } from '~/utils/providers/SearchProvider';
 
 const App: VFC = observer(() => {
   useGlobalLoader();
@@ -22,13 +23,15 @@ const App: VFC = observer(() => {
         <UserContextProvider>
           <DragDetectorProvider>
             <PageCoverProvider>
-              <MainLayout>
-                <Modal />
-                <Sprites />
+              <SearchProvider>
+                <MainLayout>
+                  <Modal />
+                  <Sprites />
 
-                <MainRouter />
-              </MainLayout>
-              <BottomContainer />
+                  <MainRouter />
+                </MainLayout>
+                <BottomContainer />
+              </SearchProvider>
             </PageCoverProvider>
           </DragDetectorProvider>
         </UserContextProvider>
diff --git a/src/containers/flow/FlowStamp/index.tsx b/src/containers/flow/FlowStamp/index.tsx
index 84eb9230..88e10da4 100644
--- a/src/containers/flow/FlowStamp/index.tsx
+++ b/src/containers/flow/FlowStamp/index.tsx
@@ -10,7 +10,7 @@ import { Toggle } from '~/components/input/Toggle';
 import classNames from 'classnames';
 import { Superpower } from '~/components/boris/Superpower';
 import { experimentalFeatures } from '~/constants/features';
-import { useSearchContext } from '~/utils/context/SearchContextProvider';
+import { useSearchContext } from '~/utils/providers/SearchProvider';
 import { useFlowContext } from '~/utils/context/FlowContextProvider';
 
 interface IProps {
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
index f2ce6bde..1a0f1f7a 100644
--- a/src/pages/index.tsx
+++ b/src/pages/index.tsx
@@ -2,7 +2,7 @@ import React, { FC } from 'react';
 import { FlowLayout } from '~/layouts/FlowLayout';
 import { useFlow } from '~/hooks/flow/useFlow';
 import { FlowContextProvider } from '~/utils/context/FlowContextProvider';
-import { SearchContextProvider } from '~/utils/context/SearchContextProvider';
+import { SearchProvider } from '~/utils/providers/SearchProvider';
 import { observer } from 'mobx-react';
 
 interface Props {}
@@ -18,9 +18,7 @@ const FlowPage: FC<Props> = observer(() => {
       nodes={nodes}
       onChangeCellView={onChangeCellView}
     >
-      <SearchContextProvider>
-        <FlowLayout isFluid={isFluid} onToggleLayout={toggleLayout} />
-      </SearchContextProvider>
+      <FlowLayout isFluid={isFluid} onToggleLayout={toggleLayout} />
     </FlowContextProvider>
   );
 });
diff --git a/src/utils/context/SearchContextProvider.tsx b/src/utils/providers/SearchProvider.tsx
similarity index 94%
rename from src/utils/context/SearchContextProvider.tsx
rename to src/utils/providers/SearchProvider.tsx
index 9204c28d..dcb0028b 100644
--- a/src/utils/context/SearchContextProvider.tsx
+++ b/src/utils/providers/SearchProvider.tsx
@@ -20,7 +20,7 @@ export const SearchContext = createContext<SearchContextProps>({
   loadMore: () => {},
 });
 
-export const SearchContextProvider: FC = ({ children }) => {
+export const SearchProvider: FC = ({ children }) => {
   const { results, searchText, isLoading, loadMore, setSearchText, hasMore } = useSearch();
 
   return (