2 files changed, 7 insertions, 4 deletions

diff --git a/src/ui/paint.c b/src/ui/paint.c
index 8843e2e2..faaf403d 100644
--- a/src/ui/paint.c
+++ b/src/ui/paint.c
@@ -79,8 +79,9 @@ void unsetClip_Paint(iPaint *d) {
 #if SDL_VERSION_ATLEAST(2, 0, 12)
     SDL_RenderSetClipRect(renderer_Paint_(d), NULL);
 #else
-    const SDL_Rect winRect = { 0, 0, d->dst->root->rect.size.x, d->dst->root->rect.size.y };
-    SDL_RenderSetClipRect(renderer_Paint_(d), &winRect);
+    const iRect rect =
+        current_Root() ? rect_Root(get_Root()) : (iRect){ zero_I2(), get_Window()->size };
+    SDL_RenderSetClipRect(renderer_Paint_(d), (const SDL_Rect *) &rect);
 #endif
 }
 
diff --git a/src/ui/window.c b/src/ui/window.c
index 80504aae..39adba83 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -998,6 +998,8 @@ void draw_Window(iWindow *d) {
 #endif
     const int   winFlags = SDL_GetWindowFlags(d->win);
     const iBool gotFocus = (winFlags & SDL_WINDOW_INPUT_FOCUS) != 0;
+    iPaint p;
+    init_Paint(&p);
     /* Clear the window. The clear color is visible as a border around the window
        when the custom frame is being used. */ {
 #if defined (iPlatformAppleMobile)
@@ -1008,6 +1010,7 @@ void draw_Window(iWindow *d) {
                                           ? uiAnnotation_ColorId
                                           : uiSeparator_ColorId);
 #endif
+        unsetClip_Paint(&p); /* update clip to full window */
         SDL_SetRenderDrawColor(d->render, back.r, back.g, back.b, 255);
         SDL_RenderClear(d->render);
     }
@@ -1019,6 +1022,7 @@ void draw_Window(iWindow *d) {
             iRoot *root = d->roots[i];
             if (root) {
                 setCurrent_Root(root);
+                unsetClip_Paint(&p); /* update clip to current root */
                 draw_Widget(root->widget);
 #if defined (LAGRANGE_ENABLE_CUSTOM_FRAME)
                 /* App icon. */
@@ -1040,8 +1044,6 @@ void draw_Window(iWindow *d) {
 #endif
                 /* Root separator and keyboard focus indicator. */
                 if (numRoots_Window(d) > 1){
-                    iPaint p;
-                    init_Paint(&p);
                     const iRect bounds = bounds_Widget(root->widget);
                     if (i == 1) {
                         fillRect_Paint(&p, (iRect){