diff --git a/src/eepp/ui/tools/uifontpickerdialog.cpp b/src/eepp/ui/tools/uifontpickerdialog.cpp
index 1a7032f79..1681eac6d 100644
--- a/src/eepp/ui/tools/uifontpickerdialog.cpp
+++ b/src/eepp/ui/tools/uifontpickerdialog.cpp
@@ -1064,7 +1064,7 @@ void UIFontPickerDialog::onWindowReady() {
 }
 
 Uint32 UIFontPickerDialog::onKeyUp( const KeyEvent& event ) {
-	if ( mCloseShortcut && event.getKeyCode() == mCloseShortcut &&
+	if ( mCloseShortcut && event.getKeyCode() == mCloseShortcut.key &&
 		 ( mCloseShortcut.mod == 0 || ( event.getMod() & mCloseShortcut.mod ) ) ) {
 		sendCommonEvent( Event::OnDiscard );
 		sendCommonEvent( Event::OnCancel );
diff --git a/src/eepp/ui/uimessagebox.cpp b/src/eepp/ui/uimessagebox.cpp
index 7381b8f33..9d0c52548 100644
--- a/src/eepp/ui/uimessagebox.cpp
+++ b/src/eepp/ui/uimessagebox.cpp
@@ -206,7 +206,7 @@ UIPushButton* UIMessageBox::getButtonCancel() const {
 }
 
 Uint32 UIMessageBox::onKeyUp( const KeyEvent& event ) {
-	if ( mCloseShortcut && event.getKeyCode() == mCloseShortcut &&
+	if ( mCloseShortcut && event.getKeyCode() == mCloseShortcut.key &&
 		 ( mCloseShortcut.mod == 0 || ( event.getMod() & mCloseShortcut.mod ) ) ) {
 		sendCommonEvent( Event::OnDiscard );
 		closeWindow();