diff --git a/src-ui/src/app/components/document-detail/document-detail.component.html b/src-ui/src/app/components/document-detail/document-detail.component.html
index b09c36b9d..0f39618f1 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.html
+++ b/src-ui/src/app/components/document-detail/document-detail.component.html
@@ -3,7 +3,7 @@
   @if (document?.versions?.length > 0) {
     <div class="btn-group" ngbDropdown role="group">
       <div class="btn-group" ngbDropdown role="group">
-        <button class="btn btn-sm btn-outline-secondary dropdown-toggle" ngbDropdownToggle>
+        <button class="btn btn-sm btn-outline-secondary dropdown-toggle" ngbDropdownToggle [disabled]="!hasVersions">
           <i-bs name="layers"></i-bs>
           <span class="d-none d-lg-inline ps-1" i18n>Version</span>
         </button>
@@ -17,7 +17,7 @@
         </div>
       </div>
       <input #versionFileInput type="file" class="visually-hidden" (change)="onVersionFileSelected($event)" />
-      <button class="btn btn-sm btn-outline-secondary" title="Upload new version" i18n-title (click)="triggerUploadVersion()" [disabled]="!userIsOwner || !userCanEdit">
+      <button class="btn btn-sm btn-outline-secondary" title="Upload new version" i18n-title (click)="versionFileInput.click()" [disabled]="!userIsOwner || !userCanEdit">
         <i-bs name="file-earmark-plus"></i-bs><span class="visually-hidden" i18n>Upload new version</span>
       </button>
     </div>
diff --git a/src-ui/src/app/components/document-detail/document-detail.component.ts b/src-ui/src/app/components/document-detail/document-detail.component.ts
index e09024251..82981a03e 100644
--- a/src-ui/src/app/components/document-detail/document-detail.component.ts
+++ b/src-ui/src/app/components/document-detail/document-detail.component.ts
@@ -712,6 +712,10 @@ export class DocumentDetailComponent
     this.prepareForm(doc)
   }
 
+  get hasVersions(): boolean {
+    return this.document?.versions?.length > 1
+  }
+
   // Update file preview and download target to a specific version (by document id)
   selectVersion(versionId: number) {
     this.selectedVersionId = versionId
@@ -1085,11 +1089,6 @@ export class DocumentDetailComponent
     })
   }
 
-  // Upload a new file version for this document
-  triggerUploadVersion() {
-    this.versionFileInput?.nativeElement?.click()
-  }
-
   onVersionFileSelected(event: Event) {
     const input = event.target as HTMLInputElement
     if (!input?.files || input.files.length === 0) return
diff --git a/src-ui/src/main.ts b/src-ui/src/main.ts
index a27709f34..e9733c098 100644
--- a/src-ui/src/main.ts
+++ b/src-ui/src/main.ts
@@ -95,6 +95,7 @@ import {
   house,
   infoCircle,
   journals,
+  layers,
   link,
   listNested,
   listTask,
@@ -308,6 +309,7 @@ const icons = {
   house,
   infoCircle,
   journals,
+  layers,
   link,
   listNested,
   listTask,