diff --git a/frontend/src/components/sidebar/sidebar-toggle-button.tsx b/frontend/src/components/sidebar/sidebar-toggle-button.tsx
new file mode 100644
index 0000000..cb78168
--- /dev/null
+++ b/frontend/src/components/sidebar/sidebar-toggle-button.tsx
@@ -0,0 +1,41 @@
+import React from 'react';
+import { useIsMobile } from '@/hooks/use-is-mobile';
+import {
+  desktopSidebarAtom,
+  mobileSidebarAtom,
+} from '@/components/sidebar/atoms/sidebar-atom';
+import { useToggleSidebar } from './hooks/use-toggle-sidebar';
+import ButtonWithIcon from '../ui/button-with-icon';
+import {
+  IconLayoutSidebarLeftCollapse,
+  IconLayoutSidebarRightCollapse,
+} from '@tabler/icons-react';
+import { useAtom } from 'jotai';
+import { cn } from '@/lib/utils';
+
+interface SidebarToggleButtonProps {
+  className?: string;
+}
+
+export default function SidebarToggleButton({
+  className,
+}: SidebarToggleButtonProps) {
+  const isMobile = useIsMobile();
+  const sidebarStateAtom = isMobile ? mobileSidebarAtom : desktopSidebarAtom;
+
+  const [isSidebarOpen] = useAtom(sidebarStateAtom);
+  const toggleSidebar = useToggleSidebar(sidebarStateAtom);
+
+  const SidebarIcon = isSidebarOpen
+    ? IconLayoutSidebarLeftCollapse
+    : IconLayoutSidebarRightCollapse;
+
+  return (
+    <ButtonWithIcon
+      className={cn(className, 'z-[100]')}
+      icon={<SidebarIcon size={20} />}
+      variant={'ghost'}
+      onClick={toggleSidebar}
+    ></ButtonWithIcon>
+  );
+}
diff --git a/frontend/src/components/sidebar/sidebar.tsx b/frontend/src/components/sidebar/sidebar.tsx
index d67713a..a8b0aa9 100644
--- a/frontend/src/components/sidebar/sidebar.tsx
+++ b/frontend/src/components/sidebar/sidebar.tsx
@@ -12,9 +12,11 @@ import {
   NavigationMenuType,
 } from '@/components/sidebar/actions/sidebar-actions';
 import ButtonWithIcon from '@/components/ui/button-with-icon';
+import SidebarToggleButton from './sidebar-toggle-button';
 
 export default function Sidebar() {
   const isMobile = useIsMobile();
+
   const [isSidebarOpen] = useAtom(
     isMobile ? mobileSidebarAtom : desktopSidebarAtom
   );
@@ -22,10 +24,25 @@ export default function Sidebar() {
   return (
     <nav
       className={`${
-        isSidebarOpen ? 'w-[270px]' : 'w-[0px]'
-      } flex-grow-0 flex-shrink-0 overflow-hidden border-r duration-300 ease-in-out`}
+        isSidebarOpen ? (isMobile ? 'w-full' : 'w-[270px]') : 'w-[0px]'
+      } ${
+        isMobile && isSidebarOpen
+          ? 'fixed top-0 left-0 h-screen z-[99] bg-background'
+          : ''
+      } flex-grow-0 flex-shrink-0 overflow-hidden border-r duration-500 ease-in-out`}
     >
-      <div className="flex flex-col flex-shrink-0 gap-0.5 p-[10px]">
+      {isMobile && (
+        <>
+          <SidebarToggleButton
+            className={`absolute top-0 ${
+              isSidebarOpen ? 'right-0' : 'left-0'
+            } right-0 m-4`}
+          />
+          <div className="mt-[20px]"></div>
+        </>
+      )}
+
+      <div className={`flex flex-col flex-shrink-0 gap-0.5 p-[10px]`}>
         <div className="h-full">
           <div className="mt-[20px]"></div>
 
diff --git a/frontend/src/components/sidebar/topbar.tsx b/frontend/src/components/sidebar/topbar.tsx
index a76ad75..563decf 100644
--- a/frontend/src/components/sidebar/topbar.tsx
+++ b/frontend/src/components/sidebar/topbar.tsx
@@ -1,35 +1,17 @@
 'use client';
 
-import { ReactNode } from 'react';
-
 import { useIsMobile } from '@/hooks/use-is-mobile';
-import {
-  desktopSidebarAtom,
-  mobileSidebarAtom,
-} from '@/components/sidebar/atoms/sidebar-atom';
-import { useToggleSidebar } from './hooks/use-toggle-sidebar';
-import ButtonWithIcon from '../ui/button-with-icon';
-import { IconLayoutSidebarLeftCollapse } from '@tabler/icons-react';
+import SidebarToggleButton from './sidebar-toggle-button';
 
 export default function TopBar() {
   const isMobile = useIsMobile();
-  const sidebarStateAtom = isMobile ? mobileSidebarAtom : desktopSidebarAtom;
-
-  const toggleSidebar = useToggleSidebar(sidebarStateAtom);
 
   return (
     <header className="max-w-full z-50 select-none">
-      <div
-        className="w-full max-w-full h-[50px] opacity-100 relative
-        transition-opacity duration-700 ease-in transition-color duration-700 ease-in"
-      >
+      <div className="w-full max-w-full h-[50px] opacity-100 relative duration-700 ease-in">
         <div className="flex justify-between items-center h-full overflow-hidden py-0 px-1 gap-2.5 border-b">
           <div className="flex items-center leading-tight h-full flex-grow-0 mr-[8px] min-w-0 font-semibold text-sm">
-            <ButtonWithIcon
-              icon={<IconLayoutSidebarLeftCollapse size={20} />}
-              variant={'ghost'}
-              onClick={toggleSidebar}
-            ></ButtonWithIcon>
+            {!isMobile && <SidebarToggleButton />}
           </div>
         </div>
       </div>