diff --git a/src/API.ts b/src/API.ts
index eead378..5e7c3e9 100644
--- a/src/API.ts
+++ b/src/API.ts
@@ -224,6 +224,7 @@ export class UserAPI {
         return bar.some(b => bar_list.includes(b % n))
     }
 
+    // TODO: bugfix here
     onbeat(...beat: number[]): boolean {
         let final_pulses: boolean[] = []
         beat.forEach(b => {
diff --git a/src/main.ts b/src/main.ts
index 9282a32..411d9f8 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -20,8 +20,8 @@ import {
   template_universe,
   template_universes,
 } from "./AppSettings";
-import { tryEvaluate } from "./Evaluator";
 import { oneDark } from "@codemirror/theme-one-dark";
+import { tryEvaluate } from "./Evaluator";
 
 
 export class Editor {
@@ -373,6 +373,7 @@ export class Editor {
           this.closeBuffersModal();
           // Focus on the editor
           this.view.focus();
+          tryEvaluate(this, this.universes[this.selected_universe.toString()].init)
         }
       }
     });