diff --git a/packages/web/src/components/modals/SpaceSettings.tsx b/packages/web/src/components/modals/SpaceSettings.tsx
index 049a25ee..34c86251 100644
--- a/packages/web/src/components/modals/SpaceSettings.tsx
+++ b/packages/web/src/components/modals/SpaceSettings.tsx
@@ -282,6 +282,14 @@ export function SpaceSettingsModal() {
   const canManageRoles = hasPermissionBit(mySpacePerms, PermissionBits.MANAGE_ROLES);
   const canBanMembers = hasPermissionBit(mySpacePerms, PermissionBits.BAN_MEMBERS);
 
+  // Reset tab and mobile view when modal opens
+  useEffect(() => {
+    if (isOpen) {
+      setTab('overview');
+      setMobileView('tabs');
+    }
+  }, [isOpen]);
+
   if (!space || !currentSpaceId) return null;
 
   const tabClass = (t: typeof tab) =>
diff --git a/packages/web/src/components/modals/UserSettings.tsx b/packages/web/src/components/modals/UserSettings.tsx
index 549b7075..68ba5d09 100644
--- a/packages/web/src/components/modals/UserSettings.tsx
+++ b/packages/web/src/components/modals/UserSettings.tsx
@@ -21,7 +21,7 @@ export function UserSettingsModal() {
   const logout = useAuthStore((s) => s.logout);
 
   const [tab, setTab] = useState<SettingsTab>('account');
-  const [mobileView, setMobileView] = useState<'tabs' | 'content'>('content');
+  const [mobileView, setMobileView] = useState<'tabs' | 'content'>('tabs');
 
   const isOpen = activeModal === 'userSettings';