diff --git a/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences.html b/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences.html
index c13d69fd5d..da9cae64f2 100644
--- a/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences.html
+++ b/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences.html
@@ -82,10 +82,10 @@ limitations under the License.
         </span>
       </section>
       <section>
-        <span class="title">Line numbers</span>
+        <span class="title">Hide line numbers</span>
         <span class="value">
           <input
-              id="showLineNumbers"
+              id="hideLineNumbers"
               type="checkbox"
               checked$="[[editPrefs.hide_line_numbers]]"
               on-change="_handleLineNumbersChanged">
diff --git a/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences.js b/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences.js
index 0a791fd282..5a97363c94 100644
--- a/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences.js
+++ b/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences.js
@@ -50,7 +50,7 @@
     },
 
     _handleLineNumbersChanged() {
-      this.set('editPrefs.hide_line_numbers', !this.$.showLineNumbers.checked);
+      this.set('editPrefs.hide_line_numbers', this.$.hideLineNumbers.checked);
       this._handleEditPrefsChanged();
     },
 
@@ -75,14 +75,10 @@
       this._handleEditPrefsChanged();
     },
 
-    _handleShowBaseVersionChanged() {
-      this.set('editPrefs.show_base', this.$.showShowBaseVersion.checked);
-      this._handleEditPrefsChanged();
-    },
-
     save() {
-      return this.$.restAPI.saveEditPreferences(this.editPrefs)
-          .then(() => { this.hasUnsavedChanges = false; });
+      return this.$.restAPI.saveEditPreferences(this.editPrefs).then(res => {
+        this.hasUnsavedChanges = false;
+      });
     },
   });
 })();
diff --git a/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences_test.html b/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences_test.html
index 118ee4f098..a0f95c12a2 100644
--- a/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences_test.html
+++ b/polygerrit-ui/app/elements/settings/gr-edit-preferences/gr-edit-preferences_test.html
@@ -93,7 +93,7 @@ limitations under the License.
           .firstElementChild.checked, editPreferences.syntax_highlighting);
       assert.equal(valueOf('Show tabs', 'editPreferences')
           .firstElementChild.checked, editPreferences.show_tabs);
-      assert.equal(valueOf('Line numbers', 'editPreferences')
+      assert.equal(valueOf('Hide line numbers', 'editPreferences')
           .firstElementChild.checked, editPreferences.hide_line_numbers);
       assert.equal(valueOf('Match brackets', 'editPreferences')
           .firstElementChild.checked, editPreferences.match_brackets);