diff --git a/src/app/folder-viewer/page.tsx b/src/app/folder-viewer/page.tsx
index 27023d3..21c2e3d 100644
--- a/src/app/folder-viewer/page.tsx
+++ b/src/app/folder-viewer/page.tsx
@@ -123,7 +123,7 @@ const FolderViewerPage = () => {
   const handleBackClick = () => {
     const parentPath = getParentPath(path || '');
     if (parentPath) {
-      router.push(`/folder-viewer?path=${parentPath}`);
+      router.push(`/folder-viewer?path=${encodeURIComponent(parentPath)}`);
     } else {
       router.push('/folder-viewer');
     }
@@ -133,7 +133,7 @@ const FolderViewerPage = () => {
     if (breadcrumbPath === '') {
       router.push('/folder-viewer');
     } else {
-      router.push(`/folder-viewer?path=${breadcrumbPath}`);
+      router.push(`/folder-viewer?path=${encodeURIComponent(breadcrumbPath)}`);
     }
   };
 
diff --git a/src/components/sidebar.tsx b/src/components/sidebar.tsx
index 075d9c0..9d154de 100644
--- a/src/components/sidebar.tsx
+++ b/src/components/sidebar.tsx
@@ -118,7 +118,7 @@ const SidebarContent = () => {
             <div className="space-y-1">
               {libraries.map((lib) => (
                 <Link
-                  href={`/folder-viewer?path=${lib.path}`}
+                  href={`/folder-viewer?path=${encodeURIComponent(lib.path)}`}
                   key={lib.id}
                   passHref
                 >
diff --git a/src/components/virtualized-media-grid.tsx b/src/components/virtualized-media-grid.tsx
index b4f496d..1cd2eba 100644
--- a/src/components/virtualized-media-grid.tsx
+++ b/src/components/virtualized-media-grid.tsx
@@ -224,7 +224,7 @@ export default function VirtualizedFolderGrid({
     return (
       <div style={style} className="p-2">
         <div className={`group relative bg-white dark:bg-slate-800 rounded-xl shadow-sm hover:shadow-lg transition-all duration-300 hover:-translate-y-1 overflow-hidden min-h-[240px] ${(item.type === 'video' || item.type === 'photo' || item.type === 'text') ? 'cursor-pointer' : ''}`}>
-          <Link href={item.isDirectory ? `/folder-viewer?path=${item.path}` : '#'} 
+          <Link href={item.isDirectory ? `/folder-viewer?path=${encodeURIComponent(item.path)}` : '#'} 
                 className="block h-full flex flex-col"
                 onClick={(e) => {
                   if (item.type === 'video' && item.id) {