From 1cd1bfca741ac5fc1a90987b4d8398d118af8052 Mon Sep 17 00:00:00 2001
From: James Stephens <james@codevanguard.com>
Date: Mon, 2 Sep 2019 16:49:29 +0200
Subject: [PATCH] Fixes bug #4650

---
 AUTHORS.md                               | 1 +
 CHANGELOG.md                             | 1 +
 apps/openmw/mwgui/confirmationdialog.cpp | 3 +--
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/AUTHORS.md b/AUTHORS.md
index c64b83dab..a18fb42a1 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -86,6 +86,7 @@ Programmers
     Jacob Essex (Yacoby)
     Jake Westrip (16bitint)
     James Carty (MrTopCat)
+    James Stephens (james-h-stephens)
     Jan-Peter Nilsson (peppe)
     Jan Borsodi (am0s)
     Jason Hooks (jhooks)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 21ce44a2a..345973314 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@
     Bug #4540: Rain delay when exiting water
     Bug #4600: Crash when no sound output is available or --no-sound is used.
     Bug #4639: Black screen after completing first mages guild mission + training
+    Bug #4650: Focus is lost after pressing ESC in confirmation dialog inside savegame dialog
     Bug #4701: PrisonMarker record is not hardcoded like other markers
     Bug #4703: Editor: it's possible to preview levelled list records
     Bug #4705: Editor: unable to open exterior cell views from Instances table
diff --git a/apps/openmw/mwgui/confirmationdialog.cpp b/apps/openmw/mwgui/confirmationdialog.cpp
index 65b079d85..9ebaf3919 100644
--- a/apps/openmw/mwgui/confirmationdialog.cpp
+++ b/apps/openmw/mwgui/confirmationdialog.cpp
@@ -40,14 +40,13 @@ namespace MWGui
 
     bool ConfirmationDialog::exit()
     {
+        setVisible(false);
         eventCancelClicked();
         return true;
     }
 
     void ConfirmationDialog::onCancelButtonClicked(MyGUI::Widget* _sender)
     {
-        setVisible(false);
-
         exit();
     }