diff --git a/dev/Common/Globals.js b/dev/Common/Globals.js
index ce573f667..3504c9a6d 100644
--- a/dev/Common/Globals.js
+++ b/dev/Common/Globals.js
@@ -35,7 +35,7 @@ export const
 	formFieldFocused = () => doc.activeElement && doc.activeElement.matches('input,textarea'),
 
 	registerShortcut = (keys, modifiers, scopes, method) =>
-		shortcuts.add(keys, modifiers, scopes, () => formFieldFocused() ? true : method()),
+		shortcuts.add(keys, modifiers, scopes, event => formFieldFocused() ? true : method(event)),
 
 	addEventsListener = (element, events, fn, options) =>
 		events.forEach(event => element.addEventListener(event, fn, options)),
diff --git a/dev/View/User/MailBox/MessageList.js b/dev/View/User/MailBox/MessageList.js
index cbfa788b3..799ba7068 100644
--- a/dev/View/User/MailBox/MessageList.js
+++ b/dev/View/User/MailBox/MessageList.js
@@ -414,7 +414,6 @@ export class MailMessageList extends AbstractViewRight {
 
 	searchEnterAction() {
 		MessagelistUserStore.mainSearch(this.sLastSearchValue);
-		this.inputMessageListSearchFocus(false);
 	}
 
 	cancelSearch() {