2 files changed, 6 insertions, 1 deletions

diff --git a/src/ui/util.c b/src/ui/util.c
index 98f0fb18..9ac18881 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -868,7 +868,8 @@ void updateValueInput_Widget(iWidget *d, const char *title, const char *prompt)
 
 static iBool messageHandler_(iWidget *msg, const char *cmd) {
     /* Almost any command dismisses the sheet. */
-    if (!(equal_Command(cmd, "media.updated") || equal_Command(cmd, "document.request.updated"))) {
+    if (!(equal_Command(cmd, "media.updated") || equal_Command(cmd, "document.request.updated") ||
+          startsWith_CStr(cmd, "window."))) {
         destroy_Widget(msg);
     }
     return iFalse;
diff --git a/src/ui/window.c b/src/ui/window.c
index 63f19e3f..4418e61f 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -680,6 +680,10 @@ static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
             return iTrue;
         case SDL_WINDOWEVENT_FOCUS_GAINED:
             d->focusGainedAt = SDL_GetTicks();
+            postCommand_App("window.focus.gained");
+            return iFalse;
+        case SDL_WINDOWEVENT_FOCUS_LOST:
+            postCommand_App("window.focus.lost");
             return iFalse;
         default:
             break;