diff --git a/src/editor/edition-tools/particles/particle-system-tool.ts b/src/editor/edition-tools/particles/particle-system-tool.ts
index 7c2581f0e..8c877f0f5 100644
--- a/src/editor/edition-tools/particles/particle-system-tool.ts
+++ b/src/editor/edition-tools/particles/particle-system-tool.ts
@@ -142,6 +142,7 @@ export default class ParticleSystemTool extends AbstractEditionTool<ParticleSyst
         // Actions
         const actions = this.tool.addFolder('Actions');
         actions.open();
+        actions.add(ps, 'preventAutoStart').name('Prevent Auto Start');
         actions.add(ps, 'rebuild').name('Rebuild');
         actions.add(ps, 'start').name('Start');
         actions.add(ps, 'stop').name('Stop');
diff --git a/src/editor/particles/asset-component.ts b/src/editor/particles/asset-component.ts
index 93a9b9bc7..425c98688 100644
--- a/src/editor/particles/asset-component.ts
+++ b/src/editor/particles/asset-component.ts
@@ -102,9 +102,11 @@ export default class ParticlesAssetComponent implements IAssetComponent {
 
         asset.data.psData.systems.forEach(s => {
             const rootUrl = s.textureName ? (s.textureName.indexOf('data:') === 0 ? '' : 'file:') : '';
-            const ps = ParticleSystem.Parse(s, this.editor.core.scene, rootUrl, false);
+            const ps = ParticleSystem.Parse(s, this.editor.core.scene, rootUrl, true);
             ps.id = Tools.RandomId();
             ps.emitter = m;
+            ps.preventAutoStart = false;
+            ps.start();
 
             Tags.AddTagsTo(ps, 'added');
             this.editor.graph.add({
diff --git a/src/tools/particles-creator/index.ts b/src/tools/particles-creator/index.ts
index 6eb4d16be..759fb6e34 100644
--- a/src/tools/particles-creator/index.ts
+++ b/src/tools/particles-creator/index.ts
@@ -106,7 +106,7 @@ export default class ParticlesCreator extends EditorPlugin {
         // Toolbar
         this.toolbar = new Toolbar('PARTICLES-CREATOR-TOOLBAR');
         this.toolbar.items = [
-            { id: 'add', text: 'Add...', caption: 'Add...', img: 'icon-add' },
+            { id: 'add', text: 'Add System...', caption: 'Add System...', img: 'icon-add' },
             { id: 'reset', text: 'Reset', caption: 'Reset', img: 'icon-play-game' },
             { type: 'break' },
             { id: 'export', text: 'Export As...', caption: 'Export As...', img: 'icon-export' },
@@ -114,7 +114,7 @@ export default class ParticlesCreator extends EditorPlugin {
             { id: 'preset', type: 'menu', text: 'Presets', caption: 'Presets', img: 'icon-particles', items: [
                 { id: 'smoke', text: 'Smoke', caption: 'Smoke' },
                 { id: 'sun', text: 'Sun', caption: 'Sun' },
-                { id: 'rain', text: 'Rain', caption: 'Rain' },
+                // { id: 'rain', text: 'Rain', caption: 'Rain' },
                 { id: 'fire', text: 'Fire', caption: 'Fire' },
                 { id: 'explosion', text: 'Explosion', caption: 'Explosion' }
             ] }
@@ -208,6 +208,7 @@ export default class ParticlesCreator extends EditorPlugin {
             case 'add':
                 const name = await Dialog.CreateWithTextInput('Particle System name?');
                 await this.addSystemToSet(ParticlesCreator.DefaultSet.systems[0], name);
+                this.saveSet();
                 this.resetSet(true);
                 break;
             // Reset particle systems set
@@ -328,7 +329,8 @@ export default class ParticlesCreator extends EditorPlugin {
         // Remove from tree
         this.tree.remove(ps.id);
 
-        // Reset
+        // Save & reset
+        this.saveSet();
         this.resetSet(true);
     }