From 5a7485f654e3635eb06519b2670971f39c2b9982 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=20Jurmanovi=C4=87?= <franjurmanovic@gmail.com>
Date: Sat, 21 Mar 2026 21:06:25 +0100
Subject: [PATCH] fix: explicit sidebar active state, popup clears mobile
 bottom bar

---
 src/components/server/ServerCreationPopup.tsx | 4 ++--
 src/components/ui/Sidebar.tsx                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/server/ServerCreationPopup.tsx b/src/components/server/ServerCreationPopup.tsx
index 7f1dbfa..fcb5d0a 100755
--- a/src/components/server/ServerCreationPopup.tsx
+++ b/src/components/server/ServerCreationPopup.tsx
@@ -310,7 +310,7 @@ export function ServerCreationPopup({
 			!isCompleted && Object.values(steps).some((step) => step.status === 'in_progress');
 
 		return (
-			<div className="fixed right-4 bottom-4 z-40">
+			<div className="fixed right-4 bottom-20 md:bottom-4 z-40">
 				<button
 					onClick={() => setIsMinimized(false)}
 					className={`flex h-16 w-16 items-center justify-center rounded-full border-2 shadow-lg transition-all hover:scale-105 ${
@@ -364,7 +364,7 @@ export function ServerCreationPopup({
 	}
 
 	return (
-		<div className="fixed right-4 bottom-4 z-40 max-h-[600px] w-96 rounded-lg border border-gray-700 bg-gray-800 shadow-2xl select-none">
+		<div className="fixed right-4 bottom-20 md:bottom-4 z-40 max-h-[600px] w-96 rounded-lg border border-gray-700 bg-gray-800 shadow-2xl select-none">
 			<div className="flex items-center justify-between border-b border-gray-700 p-4">
 				<div className="flex items-center space-x-2">
 					<span className="text-lg">🔧</span>
diff --git a/src/components/ui/Sidebar.tsx b/src/components/ui/Sidebar.tsx
index 195b03e..fa1a432 100644
--- a/src/components/ui/Sidebar.tsx
+++ b/src/components/ui/Sidebar.tsx
@@ -33,7 +33,7 @@ function UsersIcon({ active }: { active: boolean }) {
 
 export function Sidebar({ showUsers }: SidebarProps) {
   const pathname = usePathname();
-  const isServers = !pathname.startsWith('/dashboard/membership');
+  const isServers = pathname === '/dashboard' || pathname.startsWith('/dashboard/server');
   const isUsers = pathname.startsWith('/dashboard/membership');
 
   const navItems = [