use helpPopup.close()

edit/linter-dialogs.js

@@ -10,6 +10,7 @@ define(require => {
   } = require('/js/dom');
   const t = require('/js/localization');
   const {chromeSync} = require('/js/storage-util');
+  const editor = require('./editor');
   const {DEFAULTS, worker} = require('./linter-manager');
   const {getIssues} = require('./linter-report');
   const {
@@ -166,9 +167,9 @@ define(require => {
     };
   }
 
-  function onConfigCancel(event) {
-    event.preventDefault();
-    $('.dismiss').click();
+  function onConfigCancel() {
+    helpPopup.close();
+    editor.closestVisible().focus();
   }
 
   function onConfigClose() {

edit/sections-editor.js

@@ -390,7 +390,7 @@ define(require => function SectionsEditor() {
             replace: replaceOldStyle,
             focusOn: replaceOldStyle ? 0 : false,
           });
-          $('.dismiss').dispatchEvent(new Event('click'));
+          helpPopup.close();
         }
       } catch (err) {
         showError(err);