5 files changed, 23 insertions, 5 deletions

diff --git a/src/ui/inputwidget.c b/src/ui/inputwidget.c
index ae73c9c9..3f799e3c 100644
--- a/src/ui/inputwidget.c
+++ b/src/ui/inputwidget.c
@@ -331,6 +331,7 @@ void end_InputWidget(iInputWidget *d, iBool accept) {
 }
 
 static void insertChar_InputWidget_(iInputWidget *d, iChar chr) {
+    iWidget *w = as_Widget(d);
     if (d->mode == insert_InputMode) {
         insert_Array(&d->text, d->cursor, &chr);
         d->cursor++;
@@ -341,7 +342,8 @@ static void insertChar_InputWidget_(iInputWidget *d, iChar chr) {
         }
         set_Array(&d->text, d->cursor++, &chr);
         if (d->maxLen && d->cursor == d->maxLen) {
-            setFocus_Widget(NULL);
+            iWidget *nextFocus = findFocusable_Widget(w, forward_WidgetFocusDir);
+            setFocus_Widget(nextFocus == w ? NULL : nextFocus);
         }
     }
     showCursor_InputWidget_(d);
diff --git a/src/ui/util.c b/src/ui/util.c
index 91945db8..4d5ed916 100644
--- a/src/ui/util.c
+++ b/src/ui/util.c
@@ -764,9 +764,9 @@ iWidget *makeSheet_Widget(const char *id) {
     setFrameColor_Widget(sheet, uiSeparator_ColorId);
     setBackgroundColor_Widget(sheet, uiBackground_ColorId);
     setFlags_Widget(sheet,
-                    mouseModal_WidgetFlag | keepOnTop_WidgetFlag | arrangeVertical_WidgetFlag |
-                        arrangeSize_WidgetFlag | centerHorizontal_WidgetFlag |
-                        overflowScrollable_WidgetFlag,
+                    focusRoot_WidgetFlag | mouseModal_WidgetFlag | keepOnTop_WidgetFlag |
+                        arrangeVertical_WidgetFlag | arrangeSize_WidgetFlag |
+                        centerHorizontal_WidgetFlag | overflowScrollable_WidgetFlag,
                     iTrue);
     return sheet;
 }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index e2d0f922..ddb3f092 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -877,8 +877,22 @@ static const iWidget *findFocusable_Widget_(const iWidget *d, const iWidget *sta
     return NULL;
 }
 
+static const iWidget *findFocusRoot_Widget_(const iWidget *d) {
+    iForEach(ObjectList, i, d->children) {
+        const iWidget *root = findFocusRoot_Widget_(constAs_Widget(i.object));
+        if (root) {
+            return root;
+        }
+    }
+    if (d->flags & focusRoot_WidgetFlag) {
+        return d;
+    }
+    return NULL;
+}
+
 iAny *findFocusable_Widget(const iWidget *startFrom, enum iWidgetFocusDir focusDir) {
-    iWidget *root = get_Window()->root;
+    const iWidget *root = findFocusRoot_Widget_(get_Window()->root);
+    iAssert(root != NULL);
     iBool getNext = (startFrom ? iFalse : iTrue);
     const iWidget *found = findFocusable_Widget_(root, startFrom, &getNext, focusDir);
     if (!found && startFrom) {
diff --git a/src/ui/widget.h b/src/ui/widget.h
index e40b333b..79f68b3c 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -90,6 +90,7 @@ enum iWidgetFlag {
 #define wrapText_WidgetFlag                 iBit64(36)
 #define borderTop_WidgetFlag                iBit64(37)
 #define overflowScrollable_WidgetFlag       iBit64(38)
+#define focusRoot_WidgetFlag                iBit64(39)
 
 enum iWidgetAddPos {
     back_WidgetAddPos,
diff --git a/src/ui/window.c b/src/ui/window.c
index 66994e79..8df92706 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -781,6 +781,7 @@ void init_Window(iWindow *d, iRect rect) {
     }
 #endif
     d->root = new_Widget();
+    setFlags_Widget(d->root, focusRoot_WidgetFlag, iTrue);
     d->presentTime = 0.0;
     d->frameTime = SDL_GetTicks();
     d->loadAnimTimer = 0;