diff --git a/src/app/component/teams-groups-editor/selectable-list.component.html b/src/app/component/teams-groups-editor/selectable-list.component.html
index 13539642..c50194fb 100644
--- a/src/app/component/teams-groups-editor/selectable-list.component.html
+++ b/src/app/component/teams-groups-editor/selectable-list.component.html
@@ -35,19 +35,39 @@ <h2>{{ title }}</h2>
         <input
           #editInput
           [(ngModel)]="editingName"
+          (click)="$event.stopPropagation()"
           (keydown.escape)="cancelEditItem(name)"
           (keydown.enter)="saveEditedItem(name)"
           (blur)="saveEditedItem(name)" />
       </ng-template>
       <ng-template #displayItem>
-        <span>{{ name }}</span>
+        <span
+          (dblclick)="$event.stopPropagation(); handleDoubleClick(name)"
+          style="cursor: text"
+          title="Double-click to edit {{ name }}"
+          >{{ name }}</span
+        >
       </ng-template>
 
       <span *ngIf="editMode">
-        <button mat-icon-button (click)="startEditItem(name)" title="Rename {{ name }}">
+        <button
+          *ngIf="editingOrgName !== name"
+          mat-icon-button
+          (click)="$event.stopPropagation(); startEditItem(name)"
+          title="Rename {{ name }}">
           <mat-icon class="material-icons-outlined">edit</mat-icon>
         </button>
-        <button mat-icon-button (click)="deleteListItem(name)" title="Delete {{ name }}">
+        <button
+          *ngIf="editingOrgName === name"
+          mat-icon-button
+          (click)="$event.stopPropagation(); saveEditedItem(name)"
+          title="Accept edit for {{ name }}">
+          <mat-icon class="material-icons-outlined">check</mat-icon>
+        </button>
+        <button
+          mat-icon-button
+          (click)="$event.stopPropagation(); deleteListItem(name)"
+          title="Delete {{ name }}">
           <mat-icon class="material-icons-outlined">delete</mat-icon>
         </button>
       </span>
diff --git a/src/app/component/teams-groups-editor/selectable-list.component.ts b/src/app/component/teams-groups-editor/selectable-list.component.ts
index d92fd40a..1cafbe63 100644
--- a/src/app/component/teams-groups-editor/selectable-list.component.ts
+++ b/src/app/component/teams-groups-editor/selectable-list.component.ts
@@ -61,6 +61,17 @@ export class SelectableListComponent {
     });
   }
 
+  handleDoubleClick(name: string) {
+    if (!this.canEdit) {
+      return;
+    }
+    if (!this.editMode) {
+      this.editMode = true;
+      this.editModeChange.emit(this.editMode);
+    }
+    this.startEditItem(name);
+  }
+
   cancelEditItem(oldName: string) {
     console.log(`${perfNow()}: Cancel editing: ${oldName}`);
     this.editingName = '';