diff --git a/packages/frontend/src/scripts/following-feed-utils.ts b/packages/frontend/src/scripts/following-feed-utils.ts
index bf4266f830..3b4020f84b 100644
--- a/packages/frontend/src/scripts/following-feed-utils.ts
+++ b/packages/frontend/src/scripts/following-feed-utils.ts
@@ -45,13 +45,32 @@ export interface FollowingFeedState {
 	remoteWarningDismissed: boolean,
 }
 
+export const defaultFollowingFeedState: FollowingFeedState = {
+	withNonPublic: false,
+	withQuotes: false,
+	withBots: true,
+	withReplies: false,
+	onlyFiles: false,
+	userList: followingTab,
+	remoteWarningDismissed: false,
+};
+
 interface StorageInterface<T extends Partial<FollowingFeedState> = Partial<FollowingFeedState>> {
 	readonly state: Partial<T>;
 	readonly reactiveState: Ref<Partial<T>>;
 	save(updated: T): void;
 }
 
-export function createOptions(storage?: Ref<StorageInterface>): PageHeaderItem {
+export function createHeaderItem(storage?: Ref<StorageInterface>): PageHeaderItem {
+	const menu = createOptionsMenu(storage);
+	return {
+		icon: 'ti ti-dots',
+		text: i18n.ts.options,
+		handler: ev => popupMenu(menu, ev.currentTarget ?? ev.target),
+	};
+}
+
+export function createOptionsMenu(storage?: Ref<StorageInterface>): MenuItem[] {
 	const {
 		userList,
 		withNonPublic,
diff --git a/packages/frontend/src/store.ts b/packages/frontend/src/store.ts
index fd84ad2e4d..bbd9873ad8 100644
--- a/packages/frontend/src/store.ts
+++ b/packages/frontend/src/store.ts
@@ -11,7 +11,7 @@ import darkTheme from '@@/themes/d-ice.json5';
 import { miLocalStorage } from './local-storage.js';
 import { searchEngineMap } from './scripts/search-engine-map.js';
 import type { SoundType } from '@/scripts/sound.js';
-import type { FollowingFeedTab } from '@/scripts/following-feed-utils.js';
+import { defaultFollowingFeedState } from '@/scripts/following-feed-utils.js';
 import { Storage } from '@/pizzax.js';
 
 interface PostFormAction {
@@ -244,15 +244,7 @@ export const defaultStore = markRaw(new Storage('base', {
 	},
 	followingFeed: {
 		where: 'account',
-		default: {
-			withNonPublic: false,
-			withQuotes: false,
-			withBots: true,
-			withReplies: false,
-			onlyFiles: false,
-			userList: 'following' as FollowingFeedTab,
-			remoteWarningDismissed: false,
-		},
+		default: defaultFollowingFeedState,
 	},
 
 	overridedDeviceKind: {