diff --git a/packages/client/src/Shell.jsx b/packages/client/src/Shell.jsx
index bdc8f84dc5..cd0d45f1a9 100644
--- a/packages/client/src/Shell.jsx
+++ b/packages/client/src/Shell.jsx
@@ -22,7 +22,7 @@ import i18n from "./i18n";
 
 import moment from "moment-timezone";
 //import ReactSmartBanner from "./components/SmartBanner";
-import { useThemeDetector } from "@docspace/common/utils/useThemeDetector";
+import { useThemeDetector } from "@docspace/shared/hooks/useThemeDetector";
 import { isMobile, isIOS, isFirefox } from "react-device-detect";
 import IndicatorLoader from "./components/IndicatorLoader";
 import DialogsWrapper from "./components/dialogs/DialogsWrapper";
diff --git a/packages/client/src/pages/Confirm/sub-components/activateEmail.js b/packages/client/src/pages/Confirm/sub-components/activateEmail.js
index 16cb20b566..76e4ec721a 100644
--- a/packages/client/src/pages/Confirm/sub-components/activateEmail.js
+++ b/packages/client/src/pages/Confirm/sub-components/activateEmail.js
@@ -3,7 +3,7 @@ import PropTypes from "prop-types";
 import { Loader } from "@docspace/shared/components/loader";
 import Section from "@docspace/common/components/Section";
 import { combineUrl } from "@docspace/common/utils";
-import tryRedirectTo from "@docspace/common/utils/tryRedirectTo";
+import tryRedirectTo from "@docspace/shared/utils/tryRedirectTo";
 import { inject, observer } from "mobx-react";
 import { EmployeeActivationStatus } from "@docspace/shared/enums";
 
diff --git a/packages/client/src/pages/Confirm/sub-components/changeEmail.js b/packages/client/src/pages/Confirm/sub-components/changeEmail.js
index f194c8e27b..86dd07d7c3 100644
--- a/packages/client/src/pages/Confirm/sub-components/changeEmail.js
+++ b/packages/client/src/pages/Confirm/sub-components/changeEmail.js
@@ -4,7 +4,7 @@ import { inject, observer } from "mobx-react";
 import { Loader } from "@docspace/shared/components/loader";
 import Section from "@docspace/common/components/Section";
 import { combineUrl } from "@docspace/common/utils";
-import tryRedirectTo from "@docspace/common/utils/tryRedirectTo";
+import tryRedirectTo from "@docspace/shared/utils/tryRedirectTo";
 
 class ChangeEmail extends React.PureComponent {
   componentDidMount() {
diff --git a/packages/login/src/client/components/CodeLogin.tsx b/packages/login/src/client/components/CodeLogin.tsx
index d05be6a62e..103c872815 100644
--- a/packages/login/src/client/components/CodeLogin.tsx
+++ b/packages/login/src/client/components/CodeLogin.tsx
@@ -14,7 +14,7 @@ import { getLogoFromPath } from "@docspace/shared/utils";
 import { useMounted } from "../helpers/useMounted";
 import useIsomorphicLayoutEffect from "../hooks/useIsomorphicLayoutEffect";
 import LoginContainer from "@docspace/shared/components/color-theme/sub-components/LoginContainer";
-import { useThemeDetector } from "@docspace/common/utils/useThemeDetector";
+import { useThemeDetector } from "@docspace/shared/hooks/useThemeDetector";
 
 interface ILoginProps extends IInitialState {
   isDesktopEditor?: boolean;
diff --git a/packages/management/src/App.tsx b/packages/management/src/App.tsx
index 9f4e84a52f..5efc0042f9 100644
--- a/packages/management/src/App.tsx
+++ b/packages/management/src/App.tsx
@@ -1,7 +1,7 @@
 import React, { useEffect } from "react";
 import { observer, Provider as MobxProvider } from "mobx-react";
 import { I18nextProvider, useTranslation } from "react-i18next";
-import tryRedirectTo from "@docspace/common/utils/tryRedirectTo";
+import tryRedirectTo from "@docspace/shared/utils/tryRedirectTo";
 import { Outlet } from "react-router-dom";
 
 import { isMobileOnly } from "react-device-detect";
diff --git a/packages/shared/hooks/useIsSmallWindow.tsx b/packages/shared/hooks/useIsSmallWindow.tsx
index 7226802b16..9463aa7f54 100644
--- a/packages/shared/hooks/useIsSmallWindow.tsx
+++ b/packages/shared/hooks/useIsSmallWindow.tsx
@@ -1,16 +1,16 @@
-import { useState, useEffect } from "react";
+import { useState, useEffect, useCallback } from "react";
 import { isDesktop } from "react-device-detect";
 
 export const useIsSmallWindow = (windowWidth: number): boolean => {
   const [isSmallWindow, setIsSmallWindow] = useState(false);
 
-  const onCheckView = () => {
+  const onCheckView = useCallback(() => {
     if (isDesktop && window.innerWidth < windowWidth) {
       setIsSmallWindow(true);
     } else {
       setIsSmallWindow(false);
     }
-  };
+  }, [windowWidth]);
 
   useEffect(() => {
     onCheckView();
@@ -18,7 +18,7 @@ export const useIsSmallWindow = (windowWidth: number): boolean => {
     window.addEventListener("resize", onCheckView);
 
     return () => window.removeEventListener("resize", onCheckView);
-  }, []);
+  }, [onCheckView]);
 
   return isSmallWindow;
 };
diff --git a/packages/common/utils/tryRedirectTo.js b/packages/shared/utils/tryRedirectTo.ts
similarity index 71%
rename from packages/common/utils/tryRedirectTo.js
rename to packages/shared/utils/tryRedirectTo.ts
index 98a21aa0ad..57d4dc5dd1 100644
--- a/packages/common/utils/tryRedirectTo.js
+++ b/packages/shared/utils/tryRedirectTo.ts
@@ -1,4 +1,4 @@
-export default function (page) {
+function tryRedirectTo(page: string) {
   if (
     window.location.pathname === page ||
     window.location.pathname.indexOf(page) !== -1
@@ -10,3 +10,5 @@ export default function (page) {
 
   return true;
 }
+
+export default tryRedirectTo;