2 files changed, 2 insertions, 2 deletions
diff --git a/src/ui.cc b/src/ui.cc
index 4d06214a..58f92118 100644
--- a/src/ui.cc
+++ b/src/ui.cc
@@ -601,7 +601,7 @@ UI::UI(int win_w, int win_h, const char* label, const UI *cur_ui) :
 
    // Set handler for the close window event
    // (the argument is set later via user_data())
-   TopGroup->callback(close_window_cb);
+   callback(close_window_cb);
 
    // Control panel
    Panel = make_panel(win_w);
diff --git a/src/uicmd.cc b/src/uicmd.cc
index e687c600..f3da2d0a 100644
--- a/src/uicmd.cc
+++ b/src/uicmd.cc
@@ -125,8 +125,8 @@ void a_UIcmd_close_bw(void *vbw)
 
    MSG("a_UIcmd_close_bw\n");
    a_Bw_stop_clients(bw, BW_Root + BW_Img + Bw_Force);
-   ui->destroy();
    delete(layout);
+   delete(ui);
    a_Bw_free(bw);
 }