diff --git a/src/core/main/custom/toolbar.ts b/src/core/main/custom/toolbar.ts
index 53b23ac..745d318 100644
--- a/src/core/main/custom/toolbar.ts
+++ b/src/core/main/custom/toolbar.ts
@@ -399,16 +399,16 @@ CustomToolbar.register(
     }
 );
 
-window.addEventListener('beforeunload', () => {
-    CustomToolbar.save();
-});
-window.addEventListener('blur', () => {
-    CustomToolbar.save();
-});
-
 Mota.require('var', 'loading').once('coreInit', () => {
     CustomToolbar.load();
     CustomToolbar.closeAll();
+
+    window.addEventListener('beforeunload', e => {
+        CustomToolbar.save();
+    });
+    window.addEventListener('blur', () => {
+        CustomToolbar.save();
+    });
 });
 Mota.require('var', 'hook').on('reset', () => {
     CustomToolbar.showAll();