1 files changed, 3 insertions, 1 deletions

diff --git a/src/ui/widget.c b/src/ui/widget.c
index 459c2ae1..ea2e3fe2 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -55,7 +55,6 @@ iPtrArray *onTop_RootData_(void) {
 void destroyPending_Widget(void) {
     iForEach(PtrSet, i, rootData_.pendingDestruction) {
         iWidget *widget = *i.value;
-        removeOne_PtrArray(onTop_RootData_(), widget);
         if (widget->parent) {
             iRelease(removeChild_Widget(widget->parent, widget));
         }
@@ -90,6 +89,9 @@ static void aboutToBeDestroyed_Widget_(iWidget *d) {
         setFocus_Widget(NULL);
         return;
     }
+    if (flags_Widget(d) & keepOnTop_WidgetFlag) {
+        removeOne_PtrArray(onTop_RootData_(), d);
+    }
     if (isHover_Widget(d)) {
         rootData_.hover = NULL;
     }