diff -r 0a150985d6b6 -r a4affe75198c ui/gtk/toolkit.c
--- a/ui/gtk/toolkit.c	Mon May 18 21:29:56 2026 +0200
+++ b/ui/gtk/toolkit.c	Tue May 19 18:10:13 2026 +0200
@@ -165,7 +165,6 @@
 
 void ui_show(UiObject *obj) {
     gboolean visible = FALSE;
-    uic_check_state_widgets(obj->ctx);
     if(obj->widget) {
         visible = gtk_widget_is_visible(obj->widget);
 #if GTK_MAJOR_VERSION >= 4
@@ -174,6 +173,7 @@
         gtk_widget_show_all(obj->widget);
 #endif
     }
+    uic_check_state_widgets(obj->ctx);
       
     if(!visible) {
         obj->ref++;
@@ -181,18 +181,6 @@
 }
 
 void ui_close(UiObject *obj) {
-    uic_context_prepare_close(obj->ctx); // TODO: should this be moved to the close event handler? Yes!
-    /*
-    if(obj->widget) {
-#if GTK_CHECK_VERSION(4, 0, 0)
-        gtk_window_close(GTK_WINDOW(obj->widget));
-#else
-        gtk_widget_destroy(obj->widget);
-#endif
-    } else {
-        ui_window_close_request(obj);
-    }
-    */
     ui_window_close_request(obj);
 }