diff --git a/src/components/text-input.tsx b/src/components/text-input.tsx
index 74b24e23..443a8005 100644
--- a/src/components/text-input.tsx
+++ b/src/components/text-input.tsx
@@ -1,4 +1,4 @@
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState, forwardRef } from 'react'
 
 enum TextInputSize {
 	XS = 'xs',
@@ -19,31 +19,32 @@ interface TextInputProps {
 	type?: string
 	direction?: 'rtl' | 'ltr' | ''
 	className?: string
-	ref?: React.RefObject<HTMLInputElement | null>
 	debounce?: boolean
 	debounceTime?: number
 	maxLength?: number
 	size?: TextInputSize
 }
 
-export function TextInput({
-	onChange,
-	value,
-	placeholder,
-	onFocus,
-	onKeyDown,
-	disabled = false,
-	name,
-	id,
-	type = 'text',
-	direction = '',
-	className = '',
-	ref,
-	debounce = false,
-	debounceTime = 150,
-	maxLength = 1000,
-	size = TextInputSize.MD,
-}: TextInputProps) {
+export const TextInput = forwardRef<HTMLInputElement, TextInputProps>(function TextInput(
+	{
+		onChange,
+		value,
+		placeholder,
+		onFocus,
+		onKeyDown,
+		disabled = false,
+		name,
+		id,
+		type = 'text',
+		direction = '',
+		className = '',
+		debounce = false,
+		debounceTime = 150,
+		maxLength = 1000,
+		size = TextInputSize.MD,
+	},
+	ref
+) {
 	const sizes: Record<TextInputSize, string> = {
 		[TextInputSize.XS]: 'input-xs',
 		[TextInputSize.SM]: 'input-sm',
@@ -101,4 +102,4 @@ export function TextInput({
 			autoComplete="off"
 		/>
 	)
-}
+})
diff --git a/src/layouts/bookmark/bookmarks.tsx b/src/layouts/bookmark/bookmarks.tsx
index a5cbda15..59658e17 100644
--- a/src/layouts/bookmark/bookmarks.tsx
+++ b/src/layouts/bookmark/bookmarks.tsx
@@ -3,15 +3,96 @@ import { useBookmarkStore } from '@/context/bookmark.context'
 import Analytics from '@/analytics'
 import { callEvent } from '@/common/utils/call-event'
 import { SyncTarget } from '@/layouts/navbar/sync/sync'
-import { useCallback, useEffect, useRef, useState } from 'react'
+import { useCallback, useEffect, useRef, useState, useMemo } from 'react'
 import { BookmarkItem } from './components/bookmark-item'
 import { FolderPath } from './components/folder-path'
 import { AddBookmarkModal } from './components/modal/add-bookmark.modal'
 import { BookmarkContextMenu } from './components/modal/bookmark-context-menu'
 import { EditBookmarkModal } from './components/modal/edit-bookmark.modal'
 import type { Bookmark, FolderPathItem } from './types/bookmark.types'
+import { FolderPasswordModal } from './components/modal/folder-password.modal'
+
+// --- BookmarkGrid: Extracted for clarity ---
+function BookmarkGrid({
+	displayedBookmarks,
+	dragOverIndex,
+	draggedBookmarkId,
+	isManageable,
+	handleBookmarkClick,
+	handleMenuClick,
+	handleDragStart,
+	handleDragOver,
+	handleDragEnd,
+	handleDrop,
+	setShowAddBookmarkModal,
+	currentFolderIsManageable,
+}: {
+	displayedBookmarks: (Bookmark | null)[]
+	dragOverIndex: number | null
+	draggedBookmarkId: string | null
+	isManageable: (bookmark: Bookmark) => boolean
+	handleBookmarkClick: (
+		bookmark: Bookmark,
+		e?: React.MouseEvent<Element, MouseEvent>
+	) => void
+	handleMenuClick: (
+		e: React.MouseEvent<Element, MouseEvent>,
+		bookmark: Bookmark
+	) => void
+	handleDragStart: (e: React.DragEvent<HTMLDivElement>, bookmarkId: string) => void
+	handleDragOver: (e: React.DragEvent<HTMLDivElement>, index: number) => void
+	handleDragEnd: (e: React.DragEvent<HTMLDivElement>) => void
+	handleDrop: (e: React.DragEvent<HTMLDivElement>, index: number) => void
+	setShowAddBookmarkModal: (show: boolean) => void
+	currentFolderIsManageable: boolean
+}) {
+	return (
+		<div
+			className={
+				'grid grid-cols-5 gap-4 lg:gap-3 lg:px-1 w-full rounded-lg transition-all duration-300'
+			}
+		>
+			{displayedBookmarks.map((bookmark, i) =>
+				bookmark ? (
+					<div
+						key={i}
+						className={`transition-transform duration-200 ${dragOverIndex === i ? 'scale-110 border-2 border-blue-400 rounded-full' : 'rounded-full'}`}
+					>
+						<BookmarkItem
+							bookmark={bookmark}
+							onMouseDown={(e) => handleBookmarkClick(bookmark, e)}
+							onClick={(e) => {
+								if (e && e.button === 0) handleBookmarkClick(bookmark, e)
+							}}
+							canAdd={true}
+							draggable={isManageable(bookmark)}
+							isDragging={draggedBookmarkId === bookmark.id}
+							onDragStart={(e) => handleDragStart(e, bookmark.id)}
+							onDragOver={(e) => handleDragOver(e, i)}
+							onMenuClick={
+								isManageable(bookmark)
+									? (e) => handleMenuClick(e, bookmark)
+									: undefined
+							}
+							onDragEnd={handleDragEnd}
+							onDrop={(e) => handleDrop(e, i)}
+						/>
+					</div>
+				) : (
+					<BookmarkItem
+						key={i}
+						bookmark={null}
+						onClick={() => setShowAddBookmarkModal(true)}
+						canAdd={currentFolderIsManageable}
+					/>
+				)
+			)}
+		</div>
+	)
+}
 
 export function BookmarksComponent() {
+	// --- State ---
 	const {
 		bookmarks,
 		getCurrentFolderItems,
@@ -21,324 +102,336 @@ export function BookmarksComponent() {
 		setBookmarks,
 	} = useBookmarkStore()
 
-	const [showAddBookmarkModal, setShowAddBookmarkModal] = useState(false)
-	const [showEditBookmarkModal, setShowEditBookmarkModal] = useState(false)
+	// Modal and selection state
+	const [modals, setModals] = useState({
+		add: false,
+		edit: false,
+		folderPassword: false,
+	})
 	const [bookmarkToEdit, setBookmarkToEdit] = useState<Bookmark | null>(null)
-
+	const [folderPassword, setFolderPassword] = useState('')
+	const [folderToOpen, setFolderToOpen] = useState<Bookmark | null>(null)
 	const [selectedBookmark, setSelectedBookmark] = useState<Bookmark | null>(null)
-
 	const [contextMenuPos, setContextMenuPos] = useState({ x: 0, y: 0 })
-
 	const [currentFolderId, setCurrentFolderId] = useState<string | null>(null)
-
 	const [folderPath, setFolderPath] = useState<FolderPathItem[]>([])
-
 	const [currentFolderIsManageable, setCurrentFolderIsManageable] =
 		useState<boolean>(true)
-
 	const [draggedBookmarkId, setDraggedBookmarkId] = useState<string | null>(null)
 	const [dragOverIndex, setDragOverIndex] = useState<number | null>(null)
-
+	const [pendingEditBookmark, setPendingEditBookmark] = useState<Bookmark | null>(null)
+	const [isPasswordForEdit, setIsPasswordForEdit] = useState(false)
 	const syncTimeoutRef = useRef<NodeJS.Timeout | null>(null)
 
+	// --- Constants ---
 	const BOOKMARKS_PER_ROW = 5
 	const TOTAL_BOOKMARKS = BOOKMARKS_PER_ROW * 2
 
-	const debouncedSync = useCallback(() => {
-		if (syncTimeoutRef.current) {
-			clearTimeout(syncTimeoutRef.current)
-		}
+	// --- Utility functions ---
+	const isManageable = (bookmark: Bookmark) =>
+		'isManageable' in bookmark && typeof bookmark.isManageable === 'boolean'
+			? bookmark.isManageable
+			: true
 
+	// --- Debounced sync ---
+	const debouncedSync = useCallback(() => {
+		if (syncTimeoutRef.current) clearTimeout(syncTimeoutRef.current)
 		syncTimeoutRef.current = setTimeout(() => {
 			callEvent('startSync', SyncTarget.BOOKMARKS)
 			Analytics.featureUsed('drag-and-drop-bookmark', {}, 'drag')
 			syncTimeoutRef.current = null
-		}, 1000) // Wait 1 second before triggering sync
+		}, 1000)
 	}, [])
 
+	// --- Effects ---
 	useEffect(() => {
 		const handleClickOutside = () => setSelectedBookmark(null)
 		document.addEventListener('click', handleClickOutside)
-
 		return () => {
 			document.removeEventListener('click', handleClickOutside)
-			if (syncTimeoutRef.current) {
-				clearTimeout(syncTimeoutRef.current)
-			}
+			if (syncTimeoutRef.current) clearTimeout(syncTimeoutRef.current)
 		}
 	}, [])
 
-	const isManageable = (bookmark: Bookmark) => {
-		if ('isManageable' in bookmark && typeof bookmark.isManageable === 'boolean') {
-			return bookmark.isManageable
-		}
-
-		return true
-	}
-	const handleMenuClick = (e: React.MouseEvent<HTMLElement>, bookmark: Bookmark) => {
-		e.preventDefault()
-		if (isManageable(bookmark)) {
-			setSelectedBookmark(bookmark)
-			const button = e.currentTarget
-			if (button) {
-				const rect = button.getBoundingClientRect()
+	// --- Handlers ---
+	const handleMenuClick = useCallback(
+		(e: React.MouseEvent<Element, MouseEvent>, bookmark: Bookmark) => {
+			e.preventDefault()
+			if (isManageable(bookmark)) {
+				setSelectedBookmark(bookmark)
+				const rect = e.currentTarget.getBoundingClientRect()
 				setContextMenuPos({ x: rect.left - 110, y: rect.bottom + 5 })
 			}
-		}
-	}
-
-	const handleEditBookmark = (bookmark: Bookmark) => {
-		setBookmarkToEdit(bookmark)
-		setShowEditBookmarkModal(true)
-		setSelectedBookmark(null)
-	}
-	const handleBookmarkClick = (bookmark: Bookmark, e?: React.MouseEvent<any>) => {
-		if (e) {
-			e.preventDefault()
-		}
-		if (e?.button === 2) return
+		},
+		[]
+	)
 
-		if (e?.button === 1) {
-			if (bookmark.type === 'FOLDER') {
-				openBookmarks(bookmark)
-			} else {
-				e.preventDefault()
-				window.open(bookmark.url)
-			}
+	const handleEditBookmark = useCallback((bookmark: Bookmark) => {
+		if (bookmark.type === 'FOLDER' && bookmark.password) {
+			setFolderPassword(bookmark.password ?? '')
+			setPendingEditBookmark(bookmark)
+			setIsPasswordForEdit(true)
+			setModals((m) => ({ ...m, folderPassword: true }))
+			setSelectedBookmark(null)
 			return
 		}
+		setBookmarkToEdit(bookmark)
+		setModals((m) => ({ ...m, edit: true }))
+		setSelectedBookmark(null)
+	}, [])
 
-		if (bookmark.type === 'FOLDER') {
+	const handleOpenFolder = useCallback(
+		(bookmark: Bookmark, e?: React.MouseEvent<any>) => {
 			if (e?.ctrlKey || e?.metaKey) {
 				openBookmarks(bookmark)
 			} else {
 				setCurrentFolderId(bookmark.id)
-				setFolderPath([...folderPath, { id: bookmark.id, title: bookmark.title }])
-
+				setFolderPath((prev) => [
+					...prev,
+					{
+						id: bookmark.id,
+						title: bookmark.title,
+						password: bookmark.password,
+					},
+				])
 				setCurrentFolderIsManageable(isManageable(bookmark))
 			}
-		} else {
-			if (e?.ctrlKey || e?.metaKey) {
-				window.open(bookmark.url)
+		},
+		[isManageable]
+	)
+
+	const handleBookmarkClick = useCallback(
+		(bookmark: Bookmark, e?: React.MouseEvent<Element, MouseEvent>) => {
+			if (e) e.preventDefault()
+			if (e?.button === 2) return
+			if (e?.button === 1) {
+				if (bookmark.type === 'FOLDER') openBookmarks(bookmark)
+				else {
+					e.preventDefault()
+					window.open(bookmark.url)
+				}
+				return
+			}
+			if (bookmark.type === 'FOLDER') {
+				setFolderPassword(bookmark.password ?? '')
+				if (bookmark.password) {
+					setFolderToOpen(bookmark)
+					setModals((m) => ({ ...m, folderPassword: true }))
+				} else {
+					handleOpenFolder(bookmark, e)
+				}
 			} else {
-				window.location.href = bookmark.url
+				if (e?.ctrlKey || e?.metaKey) window.open(bookmark.url)
+				else window.location.href = bookmark.url
 			}
-		}
-	}
-
-	const handleDragStart = (e: React.DragEvent<HTMLDivElement>, bookmarkId: string) => {
-		if (bookmarks.find((b) => b.id === bookmarkId && !isManageable(b))) return
-
-		setDraggedBookmarkId(bookmarkId)
-		e.dataTransfer.effectAllowed = 'move'
-
-		const dragImage = document.createElement('div')
-		dragImage.style.width = '80px'
-		dragImage.style.height = '90px'
-		dragImage.style.opacity = '0.5'
-		dragImage.style.position = 'absolute'
-		dragImage.style.top = '-1000px'
-		document.body.appendChild(dragImage)
-
-		e.dataTransfer.setDragImage(dragImage, 40, 45)
+		},
+		[handleOpenFolder]
+	)
 
-		setTimeout(() => {
-			document.body.removeChild(dragImage)
-		}, 0)
-	}
+	const handleDragStart = useCallback(
+		(e: React.DragEvent<HTMLDivElement>, bookmarkId: string) => {
+			if (bookmarks.find((b) => b.id === bookmarkId && !isManageable(b))) return
+			setDraggedBookmarkId(bookmarkId)
+			e.dataTransfer.effectAllowed = 'move'
+			const dragImage = document.createElement('div')
+			dragImage.style.width = '80px'
+			dragImage.style.height = '90px'
+			dragImage.style.opacity = '0.5'
+			dragImage.style.position = 'absolute'
+			dragImage.style.top = '-1000px'
+			document.body.appendChild(dragImage)
+			e.dataTransfer.setDragImage(dragImage, 40, 45)
+			setTimeout(() => {
+				document.body.removeChild(dragImage)
+			}, 0)
+		},
+		[bookmarks, isManageable]
+	)
 
-	const handleDragOver = (e: React.DragEvent<HTMLDivElement>, index: number) => {
-		e.preventDefault()
-		e.dataTransfer.dropEffect = 'move'
-		setDragOverIndex(index)
-	}
+	const handleDragOver = useCallback(
+		(e: React.DragEvent<HTMLDivElement>, index: number) => {
+			e.preventDefault()
+			e.dataTransfer.dropEffect = 'move'
+			setDragOverIndex(index)
+		},
+		[]
+	)
 
-	const handleDragEnd = () => {
+	const handleDragEnd = useCallback(() => {
 		setDraggedBookmarkId(null)
 		setDragOverIndex(null)
-	}
-
-	const handleDrop = (e: React.DragEvent<HTMLDivElement>, targetIndex: number) => {
-		e.preventDefault()
-
-		if (!draggedBookmarkId) return
-
-		const currentItems = getCurrentFolderItems(currentFolderId)
-		const sourceIndex = currentItems.findIndex(
-			(item) => item.id === draggedBookmarkId
-		)
+	}, [])
 
-		if (sourceIndex === -1 || sourceIndex === targetIndex) {
+	const handleDrop = useCallback(
+		(e: React.DragEvent<HTMLDivElement>, targetIndex: number) => {
+			e.preventDefault()
+			if (!draggedBookmarkId) return
+			const currentItems = getCurrentFolderItems(currentFolderId)
+			const sourceIndex = currentItems.findIndex(
+				(item) => item.id === draggedBookmarkId
+			)
+			if (sourceIndex === -1 || sourceIndex === targetIndex) {
+				setDraggedBookmarkId(null)
+				setDragOverIndex(null)
+				return
+			}
+			const allBookmarks = [...bookmarks]
+			const sourceBookmark = currentItems[sourceIndex]
+			const actualSourceIndex = allBookmarks.findIndex(
+				(b) => b.id === sourceBookmark.id
+			)
+			const targetBookmark = currentItems[targetIndex]
+			const actualTargetIndex = allBookmarks.findIndex(
+				(b) => b.id === targetBookmark.id
+			)
+			if (actualSourceIndex !== -1 && actualTargetIndex !== -1) {
+				const [movedBookmark] = allBookmarks.splice(actualSourceIndex, 1)
+				allBookmarks.splice(actualTargetIndex, 0, movedBookmark)
+				const updatedBookmarks = allBookmarks.map((bookmark) => {
+					if (bookmark.parentId === currentFolderId) {
+						const newIndex = allBookmarks.findIndex(
+							(b) => b.id === bookmark.id
+						)
+						return { ...bookmark, order: newIndex }
+					}
+					return bookmark
+				})
+				setBookmarks(updatedBookmarks)
+				debouncedSync()
+			}
 			setDraggedBookmarkId(null)
 			setDragOverIndex(null)
-			return
-		}
-
-		const allBookmarks = [...bookmarks]
-
-		const sourceBookmark = currentItems[sourceIndex]
-		const actualSourceIndex = allBookmarks.findIndex(
-			(b) => b.id === sourceBookmark.id
-		)
-		const targetBookmark = currentItems[targetIndex]
-		const actualTargetIndex = allBookmarks.findIndex(
-			(b) => b.id === targetBookmark.id
-		)
-
-		if (actualSourceIndex !== -1 && actualTargetIndex !== -1) {
-			const [movedBookmark] = allBookmarks.splice(actualSourceIndex, 1)
-
-			allBookmarks.splice(actualTargetIndex, 0, movedBookmark)
-
-			const updatedBookmarks = allBookmarks.map((bookmark) => {
-				if (bookmark.parentId === currentFolderId) {
-					const newIndex = allBookmarks.findIndex((b) => b.id === bookmark.id)
-					return { ...bookmark, order: newIndex }
-				}
-				return bookmark
-			})
-
-			setBookmarks(updatedBookmarks)
-
-			debouncedSync()
-		}
-
-		setDraggedBookmarkId(null)
-		setDragOverIndex(null)
-	}
-
-	const handleNavigate = (folderId: string | null, depth: number) => {
-		if (depth === -1) {
-			setFolderPath([])
-			setCurrentFolderId(null)
-			setCurrentFolderIsManageable(true)
-			return
-		}
-
-		const newPath = folderPath.slice(0, depth + 1)
-		setFolderPath(newPath)
-		setCurrentFolderId(folderId)
+		},
+		[
+			draggedBookmarkId,
+			bookmarks,
+			getCurrentFolderItems,
+			currentFolderId,
+			setBookmarks,
+			debouncedSync,
+		]
+	)
 
-		if (folderId) {
-			const folder = bookmarks.find((b) => b.id === folderId)
-			if (folder) {
-				setCurrentFolderIsManageable(isManageable(folder))
+	const handleNavigate = useCallback(
+		(folderId: string | null, depth: number) => {
+			if (depth === -1) {
+				setFolderPath([])
+				setCurrentFolderId(null)
+				setCurrentFolderIsManageable(true)
+				return
 			}
-		} else {
-			setCurrentFolderIsManageable(true)
-		}
-	}
+			const newPath = folderPath.slice(0, depth + 1)
+			setFolderPath(newPath)
+			setCurrentFolderId(folderId)
+			if (folderId) {
+				const folder = bookmarks.find((b) => b.id === folderId)
+				if (folder) setCurrentFolderIsManageable(isManageable(folder))
+			} else {
+				setCurrentFolderIsManageable(true)
+			}
+		},
+		[folderPath, bookmarks, isManageable]
+	)
 
 	function openBookmarks(bookmark: Bookmark) {
 		const children = getCurrentFolderItems(bookmark.id)
 		const bookmarks = children.filter((b) => b.type === 'BOOKMARK')
-		for (const b of bookmarks) {
-			window.open(b.url)
-		}
+		for (const b of bookmarks) window.open(b.url)
 	}
 
 	async function onOpenInNewTab(bookmark: Bookmark) {
-		if (bookmark?.type === 'FOLDER') {
-			openBookmarks(bookmark)
-		}
-
-		if (bookmark && bookmark.type === 'BOOKMARK') {
-			window.open(bookmark.url)
-		}
-
+		if (bookmark?.type === 'FOLDER') openBookmarks(bookmark)
+		if (bookmark && bookmark.type === 'BOOKMARK') window.open(bookmark.url)
 		setSelectedBookmark(null)
 	}
 
+	// --- Derived values ---
 	const currentFolderItems = getCurrentFolderItems(currentFolderId)
-
-	const displayedBookmarks = currentFolderItems
-		.slice(0, TOTAL_BOOKMARKS)
-		.concat(
-			new Array(
-				Math.max(
-					0,
-					TOTAL_BOOKMARKS -
-						currentFolderItems.length -
-						(currentFolderIsManageable ? 1 : 0)
-				)
-			).fill(null)
-		)
-		.concat(
-			//@ts-ignore
-			currentFolderIsManageable && currentFolderItems.length < TOTAL_BOOKMARKS
-				? [null]
-				: []
-		)
-		.slice(0, TOTAL_BOOKMARKS)
-
+	const displayedBookmarks = useMemo(() => {
+		return currentFolderItems
+			.slice(0, TOTAL_BOOKMARKS)
+			.concat(
+				new Array(
+					Math.max(
+						0,
+						TOTAL_BOOKMARKS -
+							currentFolderItems.length -
+							(currentFolderIsManageable ? 1 : 0)
+					)
+				).fill(null)
+			)
+			.concat(
+				//@ts-ignore
+				currentFolderIsManageable && currentFolderItems.length < TOTAL_BOOKMARKS
+					? [null]
+					: []
+			)
+			.slice(0, TOTAL_BOOKMARKS)
+	}, [currentFolderItems, TOTAL_BOOKMARKS, currentFolderIsManageable])
+
+	// --- Render ---
 	return (
 		<>
-			<div
-				className={
-					'grid grid-cols-5 gap-4 lg:gap-3 lg:px-1 w-full rounded-lg transition-all duration-300'
+			<BookmarkGrid
+				displayedBookmarks={displayedBookmarks}
+				dragOverIndex={dragOverIndex}
+				draggedBookmarkId={draggedBookmarkId}
+				isManageable={isManageable}
+				handleBookmarkClick={handleBookmarkClick}
+				handleMenuClick={handleMenuClick}
+				handleDragStart={handleDragStart}
+				handleDragOver={handleDragOver}
+				handleDragEnd={handleDragEnd}
+				handleDrop={handleDrop}
+				setShowAddBookmarkModal={(show) =>
+					setModals((m) => ({ ...m, add: show }))
 				}
-			>
-				{' '}
-				{displayedBookmarks.map((bookmark, i) =>
-					bookmark ? (
-						<div
-							key={i}
-							className={`transition-transform duration-200 ${dragOverIndex === i ? 'scale-110 border-2 border-blue-400 rounded-full' : 'rounded-full'}`}
-						>
-							<BookmarkItem
-								bookmark={bookmark}
-								onMouseDown={(e) => handleBookmarkClick(bookmark, e)}
-								onClick={(e) => {
-									if (e?.button === 0) handleBookmarkClick(bookmark, e)
-								}}
-								canAdd={true}
-								draggable={isManageable(bookmark)}
-								isDragging={draggedBookmarkId === bookmark.id}
-								onDragStart={(e) => handleDragStart(e, bookmark.id)}
-								onDragOver={(e) => handleDragOver(e, i)}
-								onMenuClick={
-									isManageable(bookmark)
-										? (e) => handleMenuClick(e, bookmark)
-										: undefined
-								}
-								onDragEnd={handleDragEnd}
-								onDrop={(e) => handleDrop(e, i)}
-							/>
-						</div>
-					) : (
-						<BookmarkItem
-							key={i}
-							bookmark={null}
-							onClick={() => setShowAddBookmarkModal(true)}
-							canAdd={currentFolderIsManageable}
-						/>
-					)
-				)}
-				{selectedBookmark && (
-					<BookmarkContextMenu
-						position={contextMenuPos}
-						onDelete={() => {
-							deleteBookmark(selectedBookmark.id)
-							setSelectedBookmark(null)
-						}}
-						onEdit={() => handleEditBookmark(selectedBookmark)}
-						onOpenInNewTab={() => onOpenInNewTab(selectedBookmark)}
-					/>
-				)}
-			</div>
+				currentFolderIsManageable={currentFolderIsManageable}
+			/>
+			{selectedBookmark && (
+				<BookmarkContextMenu
+					position={contextMenuPos}
+					onDelete={() => {
+						deleteBookmark(selectedBookmark.id)
+						setSelectedBookmark(null)
+					}}
+					onEdit={() => handleEditBookmark(selectedBookmark)}
+					onOpenInNewTab={() => onOpenInNewTab(selectedBookmark)}
+				/>
+			)}
 			<div className="mt-2 flex justify-center w-full">
 				<FolderPath folderPath={folderPath} onNavigate={handleNavigate} />
 			</div>
+			<FolderPasswordModal
+				onConfirm={() => {
+					if (isPasswordForEdit && pendingEditBookmark) {
+						setBookmarkToEdit(pendingEditBookmark)
+						setModals((m) => ({ ...m, edit: true, folderPassword: false }))
+						setPendingEditBookmark(null)
+						setIsPasswordForEdit(false)
+					} else if (folderToOpen) {
+						handleOpenFolder(folderToOpen)
+						setModals((m) => ({ ...m, folderPassword: false }))
+					}
+				}}
+				folderPassword={folderPassword}
+				isOpen={modals.folderPassword}
+				onClose={() => {
+					setModals((m) => ({ ...m, folderPassword: false }))
+					setPendingEditBookmark(null)
+					setIsPasswordForEdit(false)
+				}}
+			/>
 			<AddBookmarkModal
-				isOpen={showAddBookmarkModal}
-				onClose={() => setShowAddBookmarkModal(false)}
+				isOpen={modals.add}
+				onClose={() => setModals((m) => ({ ...m, add: false }))}
 				onAdd={(bookmark) => addBookmark(bookmark)}
 				parentId={currentFolderId}
 			/>
 			{bookmarkToEdit && (
 				<EditBookmarkModal
-					isOpen={showEditBookmarkModal}
-					onClose={() => setShowEditBookmarkModal(false)}
+					isOpen={modals.edit}
+					onClose={() => setModals((m) => ({ ...m, edit: false }))}
 					onSave={(bookmark) => editBookmark(bookmark)}
 					bookmark={bookmarkToEdit}
 				/>
diff --git a/src/layouts/bookmark/components/bookmark-folder.tsx b/src/layouts/bookmark/components/bookmark-folder.tsx
index e139cc2f..db1e89dd 100644
--- a/src/layouts/bookmark/components/bookmark-folder.tsx
+++ b/src/layouts/bookmark/components/bookmark-folder.tsx
@@ -2,6 +2,7 @@ import { addOpacityToColor } from '@/common/color'
 import Tooltip from '@/components/toolTip'
 import { useState } from 'react'
 import { FaFolder, FaFolderOpen } from 'react-icons/fa'
+import { LuFolderLock } from 'react-icons/lu'
 import { SlOptions } from 'react-icons/sl'
 import type { Bookmark } from '../types/bookmark.types'
 import { RenderStickerPattern } from './bookmark/bookmark-sticker'
@@ -37,7 +38,11 @@ export function FolderBookmarkItem({
 	const displayIcon =
 		bookmark.customImage ||
 		(isHovered ? (
-			<FaFolderOpen className="w-6 h-6 text-blue-400" />
+			bookmark.password ? (
+				<LuFolderLock className="w-6 h-6 text-blue-400" />
+			) : (
+				<FaFolderOpen className="w-6 h-6 text-blue-400" />
+			)
 		) : (
 			<FaFolder className="w-6 h-6 text-blue-400" />
 		))
@@ -58,14 +63,18 @@ export function FolderBookmarkItem({
 			onDrop={onDrop}
 			className={`relative ${isDragging ? 'opacity-50' : ''}`}
 		>
-			<Tooltip content={bookmark.title} className='w-full lg:min-w-[5.4rem]'>
+			<Tooltip content={bookmark.title} className="w-full lg:min-w-[5.4rem]">
 				<button
 					onClick={onClick}
 					onAuxClick={onClick}
 					onMouseEnter={() => setIsHovered(true)}
 					onMouseLeave={() => setIsHovered(false)}
 					style={customStyles}
-					className={`relative flex flex-col items-center justify-center p-4 transition-all duration-300 cursor-pointer group rounded-2xl w-full h-16 md:h-[5.5rem] shadow-sm ${!bookmark.customBackground ? getFolderStyle() : 'border hover:border-blue-400/40'} transition-all ease-in-out duration-300`}
+					className={`relative flex flex-col items-center justify-center p-4 transition-all duration-300 cursor-pointer group rounded-2xl w-full h-16 md:h-[5.5rem] shadow-sm ${
+						!bookmark.customBackground
+							? getFolderStyle()
+							: 'border hover:border-blue-400/40'
+					} transition-all ease-in-out duration-300`}
 				>
 					{RenderStickerPattern(bookmark)}
 					<div className="absolute inset-0 overflow-hidden rounded-xl">
diff --git a/src/layouts/bookmark/components/modal/add-bookmark.modal.tsx b/src/layouts/bookmark/components/modal/add-bookmark.modal.tsx
index b97fae4a..4dae5b72 100644
--- a/src/layouts/bookmark/components/modal/add-bookmark.modal.tsx
+++ b/src/layouts/bookmark/components/modal/add-bookmark.modal.tsx
@@ -42,6 +42,7 @@ export function AddBookmarkModal({
 		customBackground: '',
 		customTextColor: '',
 		sticker: '',
+		password: '',
 	})
 
 	const { fileInputRef, setIconLoadError, renderIconPreview, handleImageUpload } =
@@ -93,7 +94,11 @@ export function AddBookmarkModal({
 
 			if (type === 'FOLDER') {
 				//@ts-ignore
-				onAdd({ ...baseBookmark, onlineId: null } as Bookmark)
+				onAdd({
+					...baseBookmark,
+					onlineId: null,
+					password: formData.password,
+				} as Bookmark)
 			} else {
 				let newUrl = formData.url
 				if (!newUrl.startsWith('http://') && !newUrl.startsWith('https://')) {
@@ -186,7 +191,7 @@ export function AddBookmarkModal({
 						<TypeSelector type={type} setType={setType} />
 					</div>
 
-					<div className='py-2 h-[calc(100%-4rem)] overflow-auto'>
+					<div className="py-2 h-[calc(100%-2rem)] overflow-auto">
 						{' '}
 						<div className="mb-0.5 flex flex-col items-center gap-y-2.5">
 							{type === 'BOOKMARK' && (
@@ -222,6 +227,20 @@ export function AddBookmarkModal({
 								'mt-2 w-full px-4 py-3 text-right rounded-lg transition-all duration-200 '
 							}
 						/>
+						{type === 'FOLDER' && (
+							<div className="relative h-[50px]">
+								<TextInput
+									type="password"
+									name="password"
+									placeholder="رمز عبور (اختیاری)"
+									value={formData.password ?? ''}
+									onChange={(v) => updateFormData('password', v)}
+									className={
+										'mt-2 w-full px-4 py-3 text-right absolute rounded-lg transition-all duration-300'
+									}
+								/>
+							</div>
+						)}
 						<div className="relative h-[50px]">
 							{type === 'BOOKMARK' && (
 								<TextInput
diff --git a/src/layouts/bookmark/components/modal/edit-bookmark.modal.tsx b/src/layouts/bookmark/components/modal/edit-bookmark.modal.tsx
index d26e2f6e..dfb38174 100644
--- a/src/layouts/bookmark/components/modal/edit-bookmark.modal.tsx
+++ b/src/layouts/bookmark/components/modal/edit-bookmark.modal.tsx
@@ -35,6 +35,7 @@ export function EditBookmarkModal({
 		customTextColor: '',
 		sticker: '',
 		touched: false,
+		password: '',
 	})
 
 	const [iconSource, setIconSource] = useState<IconSourceType>('auto')
@@ -64,6 +65,7 @@ export function EditBookmarkModal({
 				customTextColor: bookmark.customTextColor || '',
 				sticker: bookmark.sticker || '',
 				touched: false,
+				password: bookmark.password,
 			})
 
 			setIconSource(bookmark.customImage ? 'upload' : 'auto')
@@ -101,6 +103,7 @@ export function EditBookmarkModal({
 				customBackground: formData.customBackground || undefined,
 				customTextColor: formData.customTextColor || undefined,
 				sticker: formData.sticker || undefined,
+				password: formData.password || undefined,
 			}
 
 			if (type === 'BOOKMARK') {
@@ -190,6 +193,21 @@ export function EditBookmarkModal({
 						}
 					/>
 
+					{type === 'FOLDER' && (
+						<div className="relative h-[50px]">
+							<TextInput
+								type="password"
+								name="password"
+								placeholder="رمز عبور (اختیاری)"
+								value={formData.password ?? ''}
+								onChange={(v) => updateFormData('password', v)}
+								className={
+									'mt-2 w-full px-4 py-3 text-right absolute rounded-lg transition-all duration-300'
+								}
+							/>
+						</div>
+					)}
+
 					<div className="relative h-[50px]">
 						{type === 'BOOKMARK' && (
 							<TextInput
diff --git a/src/layouts/bookmark/components/modal/folder-password.modal.tsx b/src/layouts/bookmark/components/modal/folder-password.modal.tsx
new file mode 100644
index 00000000..10231c0b
--- /dev/null
+++ b/src/layouts/bookmark/components/modal/folder-password.modal.tsx
@@ -0,0 +1,87 @@
+import { Button } from '@/components/button/button'
+import Modal from '@/components/modal'
+import { TextInput } from '@/components/text-input'
+import { useEffect, useRef, useState } from 'react'
+
+interface FolderPasswordModalProps {
+	isOpen: boolean
+	onClose: () => void
+	onConfirm: () => void
+	folderPassword: string
+}
+
+export function FolderPasswordModal({
+	isOpen,
+	onClose,
+	onConfirm,
+	folderPassword,
+}: FolderPasswordModalProps) {
+	const [password, setPassword] = useState('')
+	const [errorMessage, setErrorMessage] = useState('')
+	const inputRef = useRef<HTMLInputElement>(null)
+
+	useEffect(() => {
+		if (isOpen) {
+			setTimeout(() => {
+				inputRef.current?.focus()
+			}, 0)
+		}
+	}, [isOpen])
+
+	const invalidPassword = 'رمز عبور اشتباه است. دوباره امتحان کنید'
+
+	return (
+		<Modal
+			direction="rtl"
+			title="ورود به پوشه"
+			isOpen={isOpen}
+			onClose={() => {
+				setPassword('')
+				setErrorMessage('')
+				onClose()
+			}}
+		>
+			<label htmlFor="password">رمز عبور پوشه را وارد کنید</label>
+			<form
+				onSubmit={(e) => {
+					e.preventDefault()
+					if (folderPassword === password) {
+						onConfirm()
+						onClose()
+						setPassword('')
+						setErrorMessage('')
+					} else setErrorMessage(invalidPassword)
+				}}
+			>
+				<div className="flex items-end gap-2 pb-[7px]">
+					<TextInput
+						type="password"
+						name="password"
+						id="password"
+						placeholder="رمز عبور"
+						value={password}
+						onChange={(v) => setPassword(v)}
+						className={`mt-2 w-full px-4 py-3 text-right rounded-lg transition-all duration-300 ${errorMessage && 'border-error'} focus:bg-red-400`}
+						ref={inputRef}
+					/>
+					<Button
+						size="md"
+						isPrimary={true}
+						disabled={!password}
+						type="submit"
+						className={
+							'btn btn-circle !w-fit px-4 border-none shadow-none disabled:text-gray-400 rounded-xl transition-colors duration-300 ease-in-out'
+						}
+					>
+						تأیید و ورود
+					</Button>
+				</div>
+			</form>
+			{errorMessage && (
+				<p className="text-error font-semibold text-[13px] font-[Vazir]">
+					{errorMessage}
+				</p>
+			)}
+		</Modal>
+	)
+}
diff --git a/src/layouts/bookmark/components/shared.tsx b/src/layouts/bookmark/components/shared.tsx
index db8fe21a..69bbfdfd 100644
--- a/src/layouts/bookmark/components/shared.tsx
+++ b/src/layouts/bookmark/components/shared.tsx
@@ -16,6 +16,7 @@ export interface BookmarkFormData {
 	customTextColor: string
 	sticker: string
 	touched?: boolean
+	password?: string
 }
 
 export function IconSourceSelector({
diff --git a/src/layouts/bookmark/types/bookmark.types.ts b/src/layouts/bookmark/types/bookmark.types.ts
index ea5e5389..c96e83d4 100644
--- a/src/layouts/bookmark/types/bookmark.types.ts
+++ b/src/layouts/bookmark/types/bookmark.types.ts
@@ -15,9 +15,11 @@ export interface Bookmark {
 	customTextColor?: string
 	sticker?: string
 	order?: number
+	password?: string
 }
 
 export interface FolderPathItem {
 	id: string
 	title: string
+	password?: string;
 }