diff --git a/api/components/corner-action.mjs b/api/components/corner-action.mjs
index a2fb276..3b21cf0 100644
--- a/api/components/corner-action.mjs
+++ b/api/components/corner-action.mjs
@@ -30,14 +30,14 @@ export const addCornerAction = async (icon, listener) => {
     $onboardingButton = document.querySelector('.onboarding-checklist-button');
   if ($onboardingButton) $cornerButtonsContainer.prepend($onboardingButton);
   $cornerButtonsContainer.prepend($helpButton);
-  document
-    .querySelector('.notion-app-inner > .notion-cursor-listener')
-    .append($cornerButtonsContainer);
+  web.render(
+    document.querySelector('.notion-app-inner > .notion-cursor-listener'),
+    $cornerButtonsContainer
+  );
 
   const $actionButton = web.html`<div class="enhancer--corner-action-button">${icon}</div>`;
   $actionButton.addEventListener('click', listener);
-
-  $cornerButtonsContainer.append($actionButton);
+  web.render($cornerButtonsContainer, $actionButton);
 
   return $actionButton;
 };
diff --git a/api/web.mjs b/api/web.mjs
index 12d43d0..4ee4182 100644
--- a/api/web.mjs
+++ b/api/web.mjs
@@ -172,24 +172,33 @@ export const readFromClipboard = () => {
   return navigator.clipboard.readText();
 };
 
+const triggerHotkeyListener = (event, hotkey) => {
+  const inInput = document.activeElement.nodeName === 'INPUT' && !hotkey.listenInInput;
+  if (inInput) return;
+  const pressed = hotkey.keys.every((key) => {
+    key = key.toLowerCase();
+    const modifiers = {
+      metaKey: ['meta', 'os', 'win', 'cmd', 'command'],
+      ctrlKey: ['ctrl', 'control'],
+      shiftKey: ['shift'],
+      altKey: ['alt'],
+    };
+    for (const modifier in modifiers) {
+      const pressed = modifiers[modifier].includes(key) && event[modifier];
+      if (pressed) return true;
+    }
+    if (key === event.key.toLowerCase()) return true;
+  });
+  if (pressed) hotkey.callback(event);
+};
 document.addEventListener('keyup', (event) => {
-  if (document.activeElement.nodeName === 'INPUT') return;
-  for (const hotkey of _hotkeyEventListeners) {
-    const pressed = hotkey.keys.every((key) => {
-      key = key.toLowerCase();
-      const modifiers = {
-        metaKey: ['meta', 'os', 'win', 'cmd', 'command'],
-        ctrlKey: ['ctrl', 'control'],
-        shiftKey: ['shift'],
-        altKey: ['alt'],
-      };
-      for (const modifier in modifiers) {
-        const pressed = modifiers[modifier].includes(key) && event[modifier];
-        if (pressed) return true;
-      }
-      if (key === event.key.toLowerCase()) return true;
-    });
-    if (pressed) hotkey.callback(event);
+  for (const hotkey of _hotkeyEventListeners.filter(({ keydown }) => !keydown)) {
+    triggerHotkeyListener(event, hotkey);
+  }
+});
+document.addEventListener('keydown', (event) => {
+  for (const hotkey of _hotkeyEventListeners.filter(({ keydown }) => keydown)) {
+    triggerHotkeyListener(event, hotkey);
   }
 });
 
@@ -200,10 +209,19 @@ document.addEventListener('keyup', (event) => {
  * available modifiers are 'alt', 'ctrl', 'meta', and 'shift'.
  * can be provided as a + separated string.
  * @param {function} callback - called whenever the keys are pressed
+ * @param {object} [opts] - fine-tuned control over when the hotkey should be triggered
+ * @param {boolean} [opts.listenInInput] - whether the hotkey callback should be triggered
+ * when an input is focused
+ * @param {boolean} [opts.keydown] - whether to listen for the hotkey on keydown.
+ * by default, hotkeys are triggered by the keyup event.
  */
-export const addHotkeyListener = (keys, callback) => {
+export const addHotkeyListener = (
+  keys,
+  callback,
+  { listenInInput = false, keydown = false } = {}
+) => {
   if (typeof keys === 'string') keys = keys.split('+');
-  _hotkeyEventListeners.push({ keys, callback });
+  _hotkeyEventListeners.push({ keys, callback, listenInInput, keydown });
 };
 /**
  * remove a listener added with web.addHotkeyListener