2 files changed, 5 insertions, 0 deletions

diff --git a/src/ui/widget.c b/src/ui/widget.c
index 62112e86..00fe0f5f 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -879,6 +879,7 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
                     printf("[%p] %s:'%s' ate the key\n",
                            child, class_Widget(child)->name,
                            cstr_String(id_Widget(child)));
+                    identify_Widget(child);
                     fflush(stdout);
                 }
 #endif
diff --git a/src/ui/window.c b/src/ui/window.c
index 39adba83..577caa4c 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -941,6 +941,10 @@ iBool dispatchEvent_Window(iWindow *d, const SDL_Event *ev) {
             if (isCommand_SDLEvent(ev) && ev->user.data2 && ev->user.data2 != root) {
                 continue; /* Not meant for this root. */
             }
+            else if ((ev->type == SDL_KEYDOWN || ev->type == SDL_KEYUP || ev->type == SDL_TEXTINPUT)
+                     && d->keyRoot != root) {
+                continue; /* Key events go only to the root with keyboard focus. */
+            }
             setCurrent_Root(root);
             const iBool wasUsed = dispatchEvent_Widget(root->widget, ev);
             if (wasUsed) {