diff --git a/web/src/features/token/create-token-dialog.tsx b/web/src/features/token/create-token-dialog.tsx
index ca167fb6..81946fa1 100644
--- a/web/src/features/token/create-token-dialog.tsx
+++ b/web/src/features/token/create-token-dialog.tsx
@@ -114,7 +114,18 @@ export function CreateTokenDialog({ children, existingNames = [] }: CreateTokenD
   const minDateTime = toLocalDateTimeInputValue(new Date())
 
   return (
-    <Dialog open={open} onOpenChange={setOpen}>
+    <Dialog open={open} onOpenChange={(nextOpen) => {
+      if (nextOpen) {
+        setCreatedToken(null)
+        setName('')
+        setNameError(null)
+        setExpirationMode('never')
+        setCustomExpiresAt('')
+        setExpiresAtError(null)
+        createMutation.reset()
+      }
+      setOpen(nextOpen)
+    }}>
       <DialogTrigger asChild>{children}</DialogTrigger>
       <DialogContent>
         {!createdToken ? (
diff --git a/web/src/features/token/token-list.tsx b/web/src/features/token/token-list.tsx
index c2110064..f40b1a6b 100644
--- a/web/src/features/token/token-list.tsx
+++ b/web/src/features/token/token-list.tsx
@@ -93,7 +93,7 @@ export function TokenList() {
       return { previousPages }
     },
     onSuccess: () => {
-      if (tokenPage && tokenPage.items.length === 1 && page > 0) {
+      if (tokenPage && tokenPage.items.length === 0 && page > 0) {
         setPage(page - 1)
       }
       setDeleteDialog({ open: false })
diff --git a/web/src/pages/skill-detail.tsx b/web/src/pages/skill-detail.tsx
index dd7da5b3..184c5252 100644
--- a/web/src/pages/skill-detail.tsx
+++ b/web/src/pages/skill-detail.tsx
@@ -107,6 +107,7 @@ export function SkillDetailPage() {
   const governanceVisible = hasRole('SKILL_ADMIN') || hasRole('SUPER_ADMIN')
   const isPendingPreview = skill?.viewingVersionStatus === 'PENDING_REVIEW'
   const canInteract = skill?.canInteract ?? true
+  const isVersionDownloadable = selectedVersionEntry?.status === 'PUBLISHED'
 
   const refreshSkill = () => {
     queryClient.invalidateQueries({ queryKey: ['skills', namespace, slug] })
@@ -690,7 +691,7 @@ export function SkillDetailPage() {
           variant="outline"
           size="lg"
           onClick={handleDownload}
-          disabled={!selectedVersionEntry || skill.status === 'ARCHIVED' || isPendingPreview}
+          disabled={!selectedVersionEntry || skill.status === 'ARCHIVED' || !isVersionDownloadable}
         >
           <svg className="w-4 h-4 mr-2" fill="none" stroke="currentColor" viewBox="0 0 24 24">
             <path strokeLinecap="round" strokeLinejoin="round" strokeWidth={2} d="M7 16a4 4 0 01-.88-7.903A5 5 0 1115.9 6L16 6a5 5 0 011 9.9M9 19l3 3m0 0l3-3m-3 3V10" />