2 files changed, 2 insertions, 1 deletions
diff --git a/bar.go b/bar.go
index 6c3c981..b735944 100644
--- a/bar.go
+++ b/bar.go
@@ -195,7 +195,7 @@ func Destroy(state *bspc.State, id int) error {
 func Cleanup(state *bspc.State) {
 	if state != nil {
 		for _, b := range bars {
-			b.destroy(finalstate)
+			b.destroy(state)
 		}
 	}
 }
diff --git a/main.go b/main.go
index 4bef201..58e55b9 100644
--- a/main.go
+++ b/main.go
@@ -72,6 +72,7 @@ func main() {
 				if err == nil {
 					switch event.Name {
 					case "monitor_add":
+						fallthrough
 					case "monitor_geometry":
 						Create(state, id)
 					case "monitor_remove":