diff --git a/CLAUDE.md b/CLAUDE.md
new file mode 100644
index 0000000000..6d4101667a
--- /dev/null
+++ b/CLAUDE.md
@@ -0,0 +1,82 @@
+# CLAUDE.md
+
+This file provides guidance to Claude Code (claude.ai/code) when working with code in this repository.
+
+## Commands
+
+### Development
+- `yarn start` - Run development server on http://localhost:8080
+- `yarn start:https` - Run development server with HTTPS
+- `yarn build` - Production build (outputs to webapp/)
+- `yarn dist` - Create distribution tarball
+
+### Testing
+- `yarn test` - Run Jest unit tests
+- `yarn test:playwright` - Run Playwright e2e tests
+- `yarn test:playwright:open` - Open Playwright test UI
+- `yarn coverage` - Run tests with coverage reporting
+
+To run a single test file:
+- `yarn test path/to/test-file.test.ts`
+- `yarn test:playwright path/to/e2e-test.ts`
+
+### Code Quality
+- `yarn lint` - Run all linters (TypeScript, ESLint, Stylelint)
+- `yarn lint:js-fix` - Auto-fix ESLint issues
+- `yarn lint:types` - TypeScript type checking only
+- `yarn lint:style` - Check CSS/PostCSS styles
+
+### Utilities
+- `yarn make-component` - Scaffold new React component
+- `yarn i18n` - Manage translations
+- `yarn storybook` - Run Storybook on port 6007
+
+## Architecture
+
+This is Element Web, a Matrix client built with React and TypeScript, customized as "HealthChat". Key architectural patterns:
+
+### Component Structure
+The application follows a hierarchical component structure:
+- `MatrixChat` - Root component managing the entire application state
+- `LeftPanel` - Room list, spaces, and navigation
+- `MainSplit` - Central room view with messages and input
+- `RightPanel` - Member list, room info, and contextual panels
+
+Components are organized in `/src/components/`:
+- `/structures/` - Major layout components
+- `/views/` - Reusable UI components grouped by function (auth, dialogs, messages, rooms, settings)
+
+### State Management
+Uses Flux architecture with:
+- Centralized dispatcher in `/src/dispatcher/`
+- Stores in `/src/stores/` as singletons
+- Actions dispatched through `dis.dispatch()`
+
+### Styling
+- PostCSS files with `.pcss` extension
+- BEM-like naming: `mx_ComponentName_element`
+- Component styles co-located with components (e.g., `_MessageTile.pcss`)
+- Theming via CSS custom properties
+
+### Matrix Integration
+- Uses `matrix-js-sdk` for all Matrix protocol operations
+- Client instance accessed via `MatrixClientPeg`
+- Room and event handling through SDK abstractions
+
+### Module System
+Plugin architecture in `/src/modules/`:
+- Allows runtime extension of functionality
+- Module API for registering custom components and handlers
+
+### Testing Patterns
+- Unit tests in `/test/unit-tests/` using Jest
+- E2E tests in `/playwright/e2e/` using Playwright
+- Mock Matrix client and SDK extensively in tests
+- Component tests via Storybook
+
+### Important Conventions
+- TypeScript strict mode - always use explicit types
+- Functional components with hooks preferred over class components
+- Translations use `_t()` function with hierarchical keys
+- 4-space indentation, 120 character line limit
+- Component files: UpperCamelCase, utilities: kebab-case
\ No newline at end of file
diff --git a/src/components/views/rooms/RoomHeader/RoomHeader.tsx b/src/components/views/rooms/RoomHeader/RoomHeader.tsx
index 6d57f0aec5..71e86df37c 100644
--- a/src/components/views/rooms/RoomHeader/RoomHeader.tsx
+++ b/src/components/views/rooms/RoomHeader/RoomHeader.tsx
@@ -242,10 +242,16 @@ export default function RoomHeader({
         roomContext.mainSplitContentType === MainSplitContentType.Call;
 
     const onAvatarClick = (): void => {
-        defaultDispatcher.dispatch({
-            action: "open_room_settings",
-            initial_tab_id: RoomSettingsTab.General,
-        });
+        if (isDirectMessage && dmMember) {
+            RightPanelStore.instance.showOrHidePhase(RightPanelPhases.MemberInfo, {
+                member: dmMember,
+            });
+        } else {
+            defaultDispatcher.dispatch({
+                action: "open_room_settings",
+                initial_tab_id: RoomSettingsTab.General,
+            });
+        }
     };
 
     return (