diff --git a/src/app/manage/sidebar.tsx b/src/app/manage/sidebar.tsx
index 69731a8..76ea5e0 100644
--- a/src/app/manage/sidebar.tsx
+++ b/src/app/manage/sidebar.tsx
@@ -329,7 +329,7 @@ export function Sidebar({ isAdmin }: SidebarProps) {
       </div>
 
       {/* Desktop sidebar */}
-      <aside className="hidden w-64 shrink-0 border-r border-slate-200/50 dark:border-slate-800/50 bg-white/40 dark:bg-slate-900/40 backdrop-blur-sm md:block">
+      <aside className="hidden w-64 shrink-0 border-r border-slate-200/50 dark:border-slate-800/50 bg-white/40 dark:bg-slate-900/40 backdrop-blur-sm md:block sticky top-16 h-[calc(100vh-4rem)] overflow-y-auto">
         <NavLinks items={filteredItems} pathname={pathname} />
       </aside>
     </>
diff --git a/src/app/manage/tags/_components/tag-resources-card.tsx b/src/app/manage/tags/_components/tag-resources-card.tsx
index 8cb179c..07818d6 100644
--- a/src/app/manage/tags/_components/tag-resources-card.tsx
+++ b/src/app/manage/tags/_components/tag-resources-card.tsx
@@ -10,6 +10,13 @@ import {
   CardHeader,
   CardTitle,
 } from '@/components/ui/card';
+import {
+  Dialog,
+  DialogContent,
+  DialogHeader,
+  DialogTitle,
+  DialogTrigger,
+} from '@/components/ui/dialog';
 import {
   QrCode,
   FileJson,
@@ -108,16 +115,40 @@ export function TagResourcesCard({ tag, tagUrls }: TagResourcesCardProps) {
               </div>
             </div>
             <div className="flex gap-2 w-full sm:w-auto">
-              <Button type="button" variant="outline" size="sm" asChild>
-                <a
-                  href={`/api/tags/${tag.code}/designed`}
-                  target="_blank"
-                  rel="noopener noreferrer"
-                >
-                  <ImageIcon className="mr-2 h-4 w-4" />
-                  Pratinjau
-                </a>
-              </Button>
+              <Dialog>
+                <DialogTrigger asChild>
+                  <Button type="button" variant="outline" size="sm">
+                    <ImageIcon className="mr-2 h-4 w-4" />
+                    Pratinjau
+                  </Button>
+                </DialogTrigger>
+                <DialogContent className="max-w-fit! p-0 gap-0">
+                  <DialogHeader className="p-4 pb-3">
+                    <DialogTitle className="text-center">
+                      Pratinjau Tag Berdesain
+                    </DialogTitle>
+                  </DialogHeader>
+                  <div>
+                    <Image
+                      src={`/api/tags/${tag.code}/designed`}
+                      alt={`Tag berdesain untuk ${tag.code}`}
+                      width={400}
+                      height={400}
+                    />
+                  </div>
+                  <div className="p-4 py-2 border-t">
+                    <Button type="button" size="sm" className="w-full" asChild>
+                      <a
+                        href={`/api/tags/${tag.code}/designed?download=true`}
+                        download
+                      >
+                        <Download className="mr-2 h-4 w-4" />
+                        Unduh Tag Berdesain
+                      </a>
+                    </Button>
+                  </div>
+                </DialogContent>
+              </Dialog>
               <Button type="button" size="sm" asChild>
                 <a
                   href={`/api/tags/${tag.code}/designed?download=true`}