diff --git a/apps/frontend/src/widgets/EditorView/model/useEditorView.ts b/apps/frontend/src/widgets/EditorView/model/useEditorView.ts
index ce5dd52c..81866220 100644
--- a/apps/frontend/src/widgets/EditorView/model/useEditorView.ts
+++ b/apps/frontend/src/widgets/EditorView/model/useEditorView.ts
@@ -8,11 +8,28 @@ import { useEdtorConnection } from "@/features/editor/model/useEditorConnection"
 
 export const useEditorView = () => {
   const { currentPage } = usePageStore();
-  const { isPanelOpen, isMaximized, setIsPanelOpen } = useEditorStore();
+  const { isPanelOpen, isMaximized, setIsPanelOpen, toggleMaximized } =
+    useEditorStore();
   useEdtorConnection(currentPage);
   const { editor } = useConnectionStore();
   const { users } = useUserStore();
 
+  useEffect(() => {
+    if (isMaximized) {
+      history.pushState(null, "");
+    }
+
+    const handlePopState = () => {
+      toggleMaximized();
+    };
+
+    window.addEventListener("popstate", handlePopState);
+
+    return () => {
+      window.removeEventListener("popstate", handlePopState);
+    };
+  }, [isMaximized]);
+
   useEffect(() => {
     setIsPanelOpen(!!currentPage);
   }, [currentPage]);