diff --git a/src/popup/lib/context.tsx b/src/popup/lib/context.tsx
index 92b7e836..c318a46f 100644
--- a/src/popup/lib/context.tsx
+++ b/src/popup/lib/context.tsx
@@ -63,9 +63,8 @@ export type ReducerActions =
   | UpdateRateOfPayAction
   | BackgroundToPopupAction
 
-export const PopupStateContext = React.createContext<PopupContext>(
-  {} as PopupContext
-)
+const PopupStateContext = React.createContext<PopupContext>({} as PopupContext)
+
 export const usePopupState = () => React.useContext(PopupStateContext)
 
 const reducer = (state: PopupState, action: ReducerActions): PopupState => {
@@ -154,6 +153,8 @@ export function PopupContextProvider({ children }: PopupContextProviderProps) {
 // #region Browser
 const BrowserContext = React.createContext<Browser>({} as Browser)
 
+export const useBrowser = () => React.useContext(BrowserContext)
+
 export const BrowserContextProvider = ({
   browser,
   children
@@ -165,12 +166,13 @@ export const BrowserContextProvider = ({
   )
 }
 
-export const useBrowser = () => React.useContext(BrowserContext)
 // #endregion
 
 // #region Translation
 const TranslationContext = React.createContext<Translation>((v: string) => v)
 
+export const useTranslation = () => React.useContext(TranslationContext)
+
 export const TranslationContextProvider = ({ children }: PropsWithChildren) => {
   const browser = useBrowser()
   const t = tFactory(browser)
@@ -182,7 +184,6 @@ export const TranslationContextProvider = ({ children }: PropsWithChildren) => {
   )
 }
 
-export const useTranslation = () => React.useContext(TranslationContext)
 // #endregion
 
 // #region Translation
@@ -190,6 +191,8 @@ const MessageContext = React.createContext<
   MessageManager<PopupToBackgroundMessage>
 >({} as MessageManager<PopupToBackgroundMessage>)
 
+export const useMessage = () => React.useContext(MessageContext)
+
 export const MessageContextProvider = ({ children }: PropsWithChildren) => {
   const browser = useBrowser()
   const message = new MessageManager<PopupToBackgroundMessage>({ browser })
@@ -201,5 +204,4 @@ export const MessageContextProvider = ({ children }: PropsWithChildren) => {
   )
 }
 
-export const useMessage = () => React.useContext(MessageContext)
 // #endregion