diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index f6f4ff42..71a79aa3 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -389,14 +389,6 @@
     "message": "Options",
     "description": "Go to Options UI"
   },
-  "openOptionsShortcuts": {
-    "message": "Shortcuts",
-    "description": "Go to shortcut configuration"
-  },
-  "openShortcutsPopup": {
-    "message": "Shortcuts",
-    "description": "Go to shortcut configuration"
-  },
   "optionsHeading": {
     "message": "Options",
     "description": "Heading for options section on manage page."
@@ -453,6 +445,13 @@
     "message": "Remove section",
     "description": "Label for the button to remove a section"
   },
+  "shortcuts": {
+    "message": "Shortcuts",
+    "description": "Go to shortcut configuration"
+  },
+  "shortcutsNote": {
+    "message": "Define keyboard shortcuts"
+  },
   "styleBadRegexp": {
     "message": "Regexp is invalid.",
     "description": "Validation message for a bad regexp in a style"
@@ -696,9 +695,6 @@
   "optionsOpenManager": {
     "message": "Manage styles"
   },
-  "optionsOpenManagerNote": {
-    "message": "Define a keyboard shortcut"
-  },
   "optionsCheckUpdate": {
     "message": "Check for and install all available updates"
   },
diff --git a/manage.html b/manage.html
index d9d95ec2..eb405e0a 100644
--- a/manage.html
+++ b/manage.html
@@ -195,7 +195,9 @@
     </div>
     <p>
       <button id="manage-options-button" i18n-text="openOptionsManage"></button>
-      <button id="manage-shortcuts-button" class="chromium-only" i18n-text="openOptionsShortcuts"></button>
+      <button id="manage-shortcuts-button" class="chromium-only"
+              i18n-text="shortcuts"
+              i18n-title="shortcutsNote"></button>
       <a id="find-editor-styles"
          href="https://userstyles.org/styles/browse/chrome-extension"
          i18n-title="editorStylesButton"
diff --git a/options/index.html b/options/index.html
index 95919c47..37be4bba 100644
--- a/options/index.html
+++ b/options/index.html
@@ -76,13 +76,16 @@
 
     <div class="block" id="actions">
       <button data-cmd="reset" i18n-text="optionsResetButton" i18n-title="optionsReset"></button>
-      <button data-cmd="open-manage" i18n-text="optionsOpenManager"><sup class="chromium-only">3</sup></button>
+      <button data-cmd="open-manage" i18n-text="optionsOpenManager"></button>
       <div data-cmd="check-updates">
         <button i18n-text="optionsCheck" i18n-title="optionsCheckUpdate">
           <span id="update-progress"></span>
         </button>
         <div id="updates-installed" i18n-text="updatesCurrentlyInstalled"></div>
       </div>
+      <a data-cmd="open-keyboard" class="chromium-only" href="chrome://extensions/configureCommands">
+        <button i18n-text="shortcuts" i18n-title="shortcutsNote"></button>
+      </a>
     </div>
   </div>
 
@@ -93,11 +96,6 @@
         <p i18n-text="optionsUpdateImportNote"></p>
       </li>
       <li i18n-text="optionsAdvancedExposeIframesNote"></li>
-      <li class="chromium-only">
-        <a data-cmd="open-keyboard"
-           i18n-text="optionsOpenManagerNote"
-           href="chrome://extensions/configureCommands"></a>
-      </li>
     </ol>
   </div>
 
diff --git a/options/index.js b/options/index.js
index 886badb5..f9afb81e 100644
--- a/options/index.js
+++ b/options/index.js
@@ -25,7 +25,7 @@ document.onclick = e => {
       break;
 
     case 'open-keyboard':
-      openURL({url: e.target.href});
+      openURL({url: target.closest('a').href});
       e.preventDefault();
       break;
 
diff --git a/popup.html b/popup.html
index 9ad62b9a..7684eb05 100644
--- a/popup.html
+++ b/popup.html
@@ -100,7 +100,9 @@
     <div id="popup-options">
       <button id="popup-manage-button" i18n-text="openManage" data-href="manage.html"></button>
       <button id="popup-options-button" i18n-text="openOptionsPopup"></button>
-      <button id="popup-shortcuts-button" class="chromium-only" i18n-text="openShortcutsPopup"></button>
+      <button id="popup-shortcuts-button" class="chromium-only"
+              i18n-text="shortcuts"
+              i18n-title="shortcutsNote"></button>
     </div>
   </div>
 </body>