diff --git a/src/app.tsx b/src/app.tsx
index 07fd033a..0dffccaf 100644
--- a/src/app.tsx
+++ b/src/app.tsx
@@ -194,7 +194,7 @@ const App = () => (
       <Route element={<GlobalLayout />}>
         <Route path='/' element={<Home />} />
         <Route path='/faq' element={<FAQ />} />
-        <Route path='/rules' element={<Rules />} />
+        <Route path='/rules/:boardIdentifier?' element={<Rules />} />
         <Route element={<BoardLayout />}>
           <Route path='/all/:timeFilterName?' element={null} />
           <Route path='/all/:timeFilterName?/settings' element={null} />
diff --git a/src/hooks/use-theme.ts b/src/hooks/use-theme.ts
index 57a09341..6fa0214a 100644
--- a/src/hooks/use-theme.ts
+++ b/src/hooks/use-theme.ts
@@ -55,6 +55,11 @@ const useTheme = (): [string, (theme: string) => void] => {
       return 'yotsuba';
     }
 
+    // Always use yotsuba for rules page (boardIdentifier in URL is for loading rules, not theming)
+    if (location.pathname.startsWith('/rules')) {
+      return 'yotsuba';
+    }
+
     // If special theme is enabled, use tomorrow
     if (isEnabled) {
       return 'tomorrow';
diff --git a/src/views/rules/rules.tsx b/src/views/rules/rules.tsx
index ebb0367d..2d860a93 100644
--- a/src/views/rules/rules.tsx
+++ b/src/views/rules/rules.tsx
@@ -1,7 +1,9 @@
 import { useEffect, useState, FormEvent } from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
 import { useSubplebbit } from '@plebbit/plebbit-react-hooks';
 import { Footer, HomeLogo } from '../home';
 import { useDirectories, DirectoryCommunity } from '../../hooks/use-directories';
+import { getSubplebbitAddress, getBoardPath } from '../../lib/utils/route-utils';
 import Markdown from '../../components/markdown';
 import styles from './rules.module.css';
 
@@ -110,8 +112,9 @@ const BoardSelector = ({
 
   const handleCustomSubmit = (e: FormEvent) => {
     e.preventDefault();
-    if (customAddress.trim()) {
-      onSelect(customAddress.trim());
+    const trimmed = customAddress.trim();
+    if (trimmed) {
+      onSelect(trimmed);
     }
   };
 
@@ -133,6 +136,7 @@ const BoardSelector = ({
                 </option>
               );
             })}
+            {selectedAddress && !directories.some((sub) => sub.address === selectedAddress) && <option value={selectedAddress}>{selectedAddress}</option>}
           </select>
           <span className={styles.orSeparator}>or</span>
           <form onSubmit={handleCustomSubmit} className={styles.customAddressForm}>
@@ -154,8 +158,16 @@ const BoardSelector = ({
 };
 
 const Rules = () => {
+  const { boardIdentifier } = useParams();
+  const navigate = useNavigate();
   const directories = useDirectories();
-  const [selectedAddress, setSelectedAddress] = useState('');
+
+  const selectedAddress = boardIdentifier ? getSubplebbitAddress(boardIdentifier, directories) : '';
+
+  const handleBoardSelect = (address: string) => {
+    const path = getBoardPath(address, directories);
+    navigate(`/rules/${path}`, { replace: true });
+  };
 
   useEffect(() => {
     window.scrollTo(0, 0);
@@ -178,7 +190,7 @@ const Rules = () => {
             Please read and respect the rules of whatever board you decide to post to.
           </div>
         </div>
-        <BoardSelector directories={directories} selectedAddress={selectedAddress} onSelect={setSelectedAddress} />
+        <BoardSelector directories={directories} selectedAddress={selectedAddress} onSelect={handleBoardSelect} />
         {selectedAddress && <BoardRulesDisplay subplebbitAddress={selectedAddress} directories={directories} />}
         <Footer />
       </div>