diff --git a/rogueviz/crystal-sokoban.cpp b/rogueviz/crystal-sokoban.cpp
index 064966f5..011ff25d 100644
--- a/rogueviz/crystal-sokoban.cpp
+++ b/rogueviz/crystal-sokoban.cpp
@@ -98,6 +98,8 @@ void run_sb() {
   vid.use_smart_range = 2;
   undos.push_back(current_state());
   peace::on = true;
+
+  sb_hooks();
   }
 
 void save_undo() {
@@ -171,6 +173,10 @@ void sb_hooks() {
     return true;
     });
   rv_hook(hooks_handleKey, 50, soko_key);
+  on_cleanup_or_next([] {
+    undos.clear();
+    celllist.clear();
+    });
   }
 
 auto sbhook = arg::add2("-crystal-sokoban", run_sb);