diff --git a/app/client/ui/ColumnTitle.ts b/app/client/ui/ColumnTitle.ts
index 1128c17f..8626b6d7 100644
--- a/app/client/ui/ColumnTitle.ts
+++ b/app/client/ui/ColumnTitle.ts
@@ -8,7 +8,7 @@ import {ViewFieldRec} from 'app/client/models/DocModel';
 import {autoGrow} from 'app/client/ui/forms';
 import {textarea} from 'app/client/ui/inputs';
 import {showTransientTooltip} from 'app/client/ui/tooltips';
-import {basicButton, cssButton, primaryButton, textButton} from 'app/client/ui2018/buttons';
+import {basicButton, primaryButton, textButton} from 'app/client/ui2018/buttons';
 import {theme, vars} from 'app/client/ui2018/cssVars';
 import {cssTextInput} from 'app/client/ui2018/editableLabel';
 import {icon} from 'app/client/ui2018/icons';
@@ -60,14 +60,15 @@ function buildColumnRenamePopup(
   // change to (it may overlap with another column)
   const colId = '$' + field.colId.peek();
 
-  // Flag that indicates if something has changed (controls the save button).
-  const disableSave = Computed.create(ctrl, (use) => {
-    return (
-      use(editedLabel)?.trim() === field.displayLabel.peek()
-      && use(editedDesc)?.trim() === field.description.peek()
-    );
+  const hasChange = Computed.create(ctrl, (use) => {
+    return use(editedLabel)?.trim() !== field.displayLabel.peek()
+        || use(editedDesc)?.trim() !== field.description.peek();
   });
 
+  const cantSave = Computed.create(ctrl, (use) => {
+    const filledLabel = Boolean(use(editedLabel)?.trim());
+    return !filledLabel;
+  });
 
   // Function to change a column name.
   const saveColumnLabel = async () => {
@@ -230,14 +231,22 @@ function buildColumnRenamePopup(
       }
     }),
     cssButtons(
+      primaryButton(
+        dom.on('click', cancel),
+        testId('close'),
+        dom.hide(hasChange),
+        t("Close"),
+      ),
       primaryButton(t("Save"),
         dom.on('click', close),
-        dom.boolAttr('disabled', use => use(disableSave)),
         testId('save'),
+        dom.show(hasChange),
+        dom.boolAttr('disabled', cantSave),
       ),
       basicButton(t("Cancel"),
         testId('cancel'),
         dom.on('click', cancel),
+        dom.show(hasChange)
       ),
     ),
     // After showing the popup, focus the label input and select it's content.
@@ -338,8 +347,9 @@ const cssTextArea = styled(textarea, `
 const cssButtons = styled('div', `
   display: flex;
   margin-top: 16px;
-  & > .${cssButton.className}:not(:first-child) {
-    margin-left: 8px;
+  gap: 8px;
+  & button {
+    min-width: calc(50 / 13 * 1em); /* Min 50px for 13px font size, to make Save and Close buttons equal width */
   }
 `);
 
diff --git a/app/client/ui/DescriptionConfig.ts b/app/client/ui/DescriptionConfig.ts
index 242a2352..ae67fa1b 100644
--- a/app/client/ui/DescriptionConfig.ts
+++ b/app/client/ui/DescriptionConfig.ts
@@ -34,7 +34,7 @@ export function buildDescriptionConfig(
           { onInput: false },
           { rows: '3' },
           dom.on('blur', async (e, elem) => {
-            await origColumn.description.saveOnly(elem.value);
+            await origColumn.description.setAndSave(elem.value.trim());
           }),
           testId('column-description'),
           autoGrow(fromKo(origColumn.description))
diff --git a/test/nbrowser/DescriptionColumn.ts b/test/nbrowser/DescriptionColumn.ts
index 96614549..87bef772 100644
--- a/test/nbrowser/DescriptionColumn.ts
+++ b/test/nbrowser/DescriptionColumn.ts
@@ -6,9 +6,120 @@ import {setupTestSuite} from 'test/nbrowser/testUtils';
 describe('DescriptionColumn', function() {
   this.timeout(20000);
   const cleanup = setupTestSuite();
+  let session: gu.Session;
+
+  before(async () => {
+    session = await gu.session().teamSite.login();
+  });
+
+  it('should switch between close and save', async () => {
+    await session.tempNewDoc(cleanup);
+    // Add new column.
+    await addColumn();
+
+    // We should have popup at column D.
+    await popupIsAt('D');
+
+    // Close button should be visible.
+    assert.isTrue(await closeVisible());
+    assert.isFalse(await saveVisible());
+    assert.isFalse(await cancelVisible());
+
+    // Change something in the name.
+    await gu.sendKeys('DD');
+    // Save button should be visible.
+    assert.isFalse(await closeVisible());
+    assert.isTrue(await saveVisible());
+    assert.isFalse(await saveDisabled());
+    assert.isTrue(await cancelVisible());
+
+    // Restore name.
+    await gu.sendKeys(Key.BACK_SPACE);
+    // Close button should be visible.
+    assert.isTrue(await closeVisible());
+    assert.isFalse(await saveVisible());
+    assert.isFalse(await cancelVisible());
+
+    // Add description.
+    await clickAddDescription();
+    await waitForFocus('description');
+
+    // Still close button should be visible.
+    assert.isTrue(await closeVisible());
+    assert.isFalse(await saveVisible());
+    assert.isFalse(await cancelVisible());
+
+    // Type something.
+    await gu.sendKeys('D');
+    // Save button should be visible.
+    assert.isFalse(await closeVisible());
+    assert.isTrue(await saveVisible());
+    assert.isFalse(await saveDisabled());
+    assert.isTrue(await cancelVisible());
+
+    // Clear and move to label.
+    await gu.sendKeys(Key.BACK_SPACE);
+    await gu.sendKeys(Key.ARROW_UP);
+    await waitForFocus('label');
+    assert.isTrue(await closeVisible());
+    assert.isFalse(await saveVisible());
+    assert.isFalse(await cancelVisible());
+
+    // Clear label completely, we have change, but we can't save.
+    await gu.sendKeys(Key.BACK_SPACE);
+    assert.isEmpty(await getLabel());
+    assert.isFalse(await closeVisible());
+    assert.isTrue(await saveVisible());
+    // But save button is disabled.
+    assert.isTrue(await saveDisabled());
+    assert.isTrue(await cancelVisible());
+
+    // Add description.
+    await gu.sendKeys(Key.ARROW_DOWN);
+    await waitForFocus('description');
+    await gu.sendKeys('D');
+
+    // Still can't save.
+    assert.isFalse(await closeVisible());
+    assert.isTrue(await saveVisible());
+    assert.isTrue(await saveDisabled());
+    assert.isTrue(await cancelVisible());
+
+    // Clear description completely, restore label and press close.
+    await gu.sendKeys(Key.BACK_SPACE);
+    await gu.sendKeys(Key.ARROW_UP);
+    await waitForFocus('label');
+    await gu.sendKeys('D');
+    await pressClose();
+
+    // Make sure popup is gone.
+    assert.isFalse(await popupVisible());
+    // Make sure column D exists.
+    assert.isTrue(await gu.getColumnHeader({col: 'D'}).isDisplayed());
+    await gu.undo();
+    assert.isFalse(await gu.getColumnHeader({col: 'D'}).isPresent());
+  });
+
+  it('should close popup by enter and escape', async () => {
+    // Add another column, make sure that enter and escape work.
+    await addColumn();
+    await popupIsAt('D');
+    await gu.sendKeys(Key.ESCAPE);
+    assert.isFalse(await popupVisible());
+    // Column D is still there.
+    assert.isTrue(await gu.getColumnHeader({col: 'D'}).isDisplayed());
+    await gu.undo();
+    assert.isFalse(await gu.getColumnHeader({col: 'D'}).isPresent());
+
+    await addColumn();
+    await popupIsAt('D');
+    await gu.sendKeys(Key.ENTER);
+    assert.isFalse(await popupVisible());
+    assert.isTrue(await gu.getColumnHeader({col: 'D'}).isDisplayed());
+    await gu.undo();
+  });
 
   it('should show info tooltip in a Grid View', async () => {
-    const session = await gu.session().teamSite.login();
     await session.tempDoc(cleanup, 'Hello.grist');
     await gu.dismissWelcomeTourIfNeeded();
 
@@ -351,9 +462,21 @@ function getDescriptionInput() {
   return driver.find('.test-right-panel .test-column-description');
 }
 
+function getLabel() {
+  return driver.findWait(".test-column-title-label", 1000).getAttribute('value');
+}
+
+async function popupVisible() {
+  if (await driver.find(".test-column-title-popup").isPresent()) {
+    return await driver.find(".test-column-title-popup").isDisplayed();
+  } else {
+    return false;
+  }
+}
+
 async function popupIsAt(col: string) {
   // Make sure we are now at column.
-  assert.equal(await driver.find(".test-column-title-label").getAttribute('value'), col);
+  assert.equal(await getLabel(), col);
   // Make sure that popup is near the column.
   const headerCRect = await gu.getColumnHeader({col}).getRect();
   const popup = await driver.find(".test-column-title-popup").getRect();
@@ -385,6 +508,16 @@ async function pressSave() {
   await gu.waitForServer();
 }
 
+async function pressClose() {
+  await driver.find(".test-column-title-close").click();
+  await gu.waitForServer();
+}
+
+async function saveDisabled() {
+  const value = await driver.find(".test-column-title-save").getAttribute('disabled');
+  return value === 'true';
+}
+
 async function pressCancel() {
   await driver.find(".test-column-title-cancel").click();
   await gu.waitForServer();
@@ -394,3 +527,20 @@ async function clickAddDescription() {
   await driver.find(".test-column-title-add-description").click();
   await waitForFocus('description');
 }
+
+async function addColumn() {
+  await driver.find(".mod-add-column").click();
+  await gu.waitForServer();
+}
+
+async function closeVisible() {
+  return await driver.find(".test-column-title-close").isDisplayed();
+}
+
+async function saveVisible() {
+  return await driver.find(".test-column-title-save").isDisplayed();
+}
+
+async function cancelVisible() {
+  return await driver.find(".test-column-title-cancel").isDisplayed();
+}