removing column closes menu and stops editing

1 files changed, 5 insertions, 1 deletions

diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index 49cb86732..1b23e3c40 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -358,6 +358,10 @@ export class CollectionSchemaView extends CollectionSubView() {
     @undoBatch
     removeColumn = (index: number) => {
         if (this.columnKeys.length === 1) return;
+        if (this._columnMenuIndex === index) {
+            this._headerRefs[index].toggleEditing(false);
+            this.closeColumnMenu();
+        }
         const currWidths = this.storedColumnWidths.slice();
         currWidths.splice(index, 1);
         const newDesiredTableWidth = currWidths.reduce((w, cw) => w + cw, 0);
@@ -425,7 +429,7 @@ export class CollectionSchemaView extends CollectionSubView() {
     @action
     dragColumn = (e: PointerEvent, index: number) => {
         this.closeColumnMenu();
-        this._headerRefs.forEach(ref => ref.stopEditing());
+        this._headerRefs.forEach(ref => ref.toggleEditing(false));
         this._draggedColIndex = index;
         this.setColDrag(true);
         const dragData = new DragManager.ColumnDragData(index);