diff --git a/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts b/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts
index f852e410c..3c3c2b049 100644
--- a/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts
+++ b/src/app/features/project/overview/components/add-component-dialog/add-component-dialog.component.ts
@@ -84,10 +84,13 @@ export class AddComponentDialogComponent implements OnInit {
   constructor() {
     effect(() => {
       const storageLocations = this.storageLocations();
-      if (!storageLocations) return;
+      if (!storageLocations?.length) return;
 
-      const defaultRegion = this.currentUser()?.defaultRegionId || storageLocations[0].id;
-      this.componentForm.controls[ComponentFormControls.StorageLocation].setValue(defaultRegion);
+      const storageLocationControl = this.componentForm.controls[ComponentFormControls.StorageLocation];
+      if (!storageLocationControl.value) {
+        const defaultRegion = this.currentUser()?.defaultRegionId ?? storageLocations[0].id;
+        storageLocationControl.setValue(defaultRegion);
+      }
     });
   }
 
diff --git a/src/app/shared/components/wiki/wiki-list/wiki-list.component.html b/src/app/shared/components/wiki/wiki-list/wiki-list.component.html
index a5784ca7f..dd63ab679 100644
--- a/src/app/shared/components/wiki/wiki-list/wiki-list.component.html
+++ b/src/app/shared/components/wiki/wiki-list/wiki-list.component.html
@@ -71,20 +71,41 @@ <h4 class="ml-2">{{ item.label | translate }}</h4>
       </p-panel>
     } @else {
       <div class="mb-2">
-        <p-button class="btn-icon-only" raised outlined severity="contrast" (onClick)="collapseNavigation()">
+        <p-button
+          class="btn-icon-only"
+          styleClass="flex gap-3"
+          raised
+          outlined
+          severity="contrast"
+          (onClick)="collapseNavigation()"
+        >
           <i class="fas fa-list-ul"></i>
           <i class="fas fa-forward"></i>
         </p-button>
       </div>
       @if (canEdit()) {
-        <p-button
-          class="btn-icon-only"
-          icon="fas fa-plus"
-          raised
-          outlined
-          severity="success"
-          (onClick)="openAddWikiDialog()"
-        />
+        <div class="flex gap-2">
+          <p-button
+            class="btn-icon-only"
+            icon="fas fa-plus"
+            raised
+            outlined
+            severity="success"
+            (onClick)="openAddWikiDialog()"
+          />
+          @if (list().length) {
+            @if (!isHomeWikiSelected()) {
+              <p-button
+                class="btn-icon-only"
+                icon="fas fa-trash"
+                raised
+                outlined
+                severity="danger"
+                (onClick)="openDeleteWikiDialog()"
+              />
+            }
+          }
+        </div>
       }
     }
   }