diff --git a/edit/beautify.js b/edit/beautify.js
index c333c3ab..b605d93c 100644
--- a/edit/beautify.js
+++ b/edit/beautify.js
@@ -92,7 +92,7 @@ define(require => {
         ]),
         $create('p.beautify-hint', [
           $create('span', t('styleBeautifyHint') + '\u00A0'),
-          createHotkeyInput(HOTKEY_ID, () => moveFocus($('#help-popup'), 1)),
+          createHotkeyInput(HOTKEY_ID, () => moveFocus($('#help-popup'), 0)),
         ]),
         $create('.buttons', [
           $create('button', {
diff --git a/js/dlg/message-box.js b/js/dlg/message-box.js
index d245432f..01bdb10a 100644
--- a/js/dlg/message-box.js
+++ b/js/dlg/message-box.js
@@ -87,7 +87,7 @@ define(require => {
 
       mess.originalFocus = document.activeElement;
       // skip external links like feedback
-      while ((moveFocus(mess.element, 1) || {}).target === '_blank') {/*NOP*/}
+      while ((moveFocus(mess.element, 0) || {}).target === '_blank') {/*NOP*/}
       // suppress focus outline when invoked via click
       if (focusAccessibility.lastFocusedViaClick && document.activeElement) {
         document.activeElement.dataset.focusedViaClick = '';