diff --git a/basicWindow.go b/basicWindow.go
index aa8713b..bd68fa5 100644
--- a/basicWindow.go
+++ b/basicWindow.go
@@ -111,6 +111,12 @@ func (w *BasicWindow) Make() {
 	w.win = w.parent.RawWindow(w.title)
 	w.win.Custom = func() {
 		log.Warn("BasicWindow.Custom() closed. TODO: handle this", w.title)
+		log.Warn("BasicWindow.Custom() closed. handled properly?", w.title)
+		w.parent.Hide()
+		w.hidden = true
+		if w.Custom != nil {
+			w.Custom()
+		}
 	}
 	if w.vertical {
 		w.box = w.win.NewVerticalBox("BW VBOX")