diff --git a/scripts/system/edit.js b/scripts/system/edit.js
index f549c7dd85..9285023ed8 100644
--- a/scripts/system/edit.js
+++ b/scripts/system/edit.js
@@ -2366,22 +2366,19 @@ var selectedParticleEntity = 0;
 var selectedParticleEntityID = null;
 
 function selectParticleEntity(entityID) {
-    var properties = Entities.getEntityProperties(entityID);
     selectedParticleEntityID = entityID;
+
+    var properties = Entities.getEntityProperties(entityID);
     if (properties.emitOrientation) {
         properties.emitOrientation = Quat.safeEulerAngles(properties.emitOrientation);
     }
-    var particleData = {
-        messageType: "particle_settings",
-        currentProperties: properties
-    };
+
     particleExplorerTool.destroyWebView();
     particleExplorerTool.createWebView();
 
     selectedParticleEntity = entityID;
     particleExplorerTool.setActiveParticleEntity(entityID);
-
-    particleExplorerTool.webView.emitScriptEvent(JSON.stringify(particleData));
+    particleExplorerTool.setActiveParticleProperties(properties);
 
     // Switch to particle explorer
     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
diff --git a/scripts/system/particle_explorer/particleExplorerTool.js b/scripts/system/particle_explorer/particleExplorerTool.js
index d85fc169b1..016691e2b6 100644
--- a/scripts/system/particle_explorer/particleExplorerTool.js
+++ b/scripts/system/particle_explorer/particleExplorerTool.js
@@ -16,37 +16,55 @@ var PARTICLE_EXPLORER_HTML_URL = Script.resolvePath('particleExplorer.html');
 
 ParticleExplorerTool = function() {
     var that = {};
+    that.activeParticleEntity = 0;
+    that.activeParticleProperties = {};
+
     that.createWebView = function() {
         that.webView = Tablet.getTablet("com.highfidelity.interface.tablet.system");
         that.webView.setVisible = function(value) {};
         that.webView.webEventReceived.connect(that.webEventReceived);
-    }
+    };
 
     that.destroyWebView = function() {
         if (!that.webView) {
             return;
         }
         that.activeParticleEntity = 0;
+        that.activeParticleProperties = {};
 
         var messageData = {
             messageType: "particle_close"
         };
         that.webView.emitScriptEvent(JSON.stringify(messageData));
+    };
+
+    function sendActiveParticleProperies() {
+        that.webView.emitScriptEvent(JSON.stringify({
+            messageType: "particle_settings",
+            currentProperties: that.activeParticleProperties
+        }));
     }
 
     that.webEventReceived = function(data) {
-        var data = JSON.parse(data);
+        data = JSON.parse(data);
         if (data.messageType === "settings_update") {
             if (data.updatedSettings.emitOrientation) {
                 data.updatedSettings.emitOrientation = Quat.fromVec3Degrees(data.updatedSettings.emitOrientation);
             }
             Entities.editEntity(that.activeParticleEntity, data.updatedSettings);
+        } else if (data.messageType === "page_loaded") {
+            sendActiveParticleProperies();
         }
-    }
+    };
 
     that.setActiveParticleEntity = function(id) {
         that.activeParticleEntity = id;
-    }
+    };
+
+    that.setActiveParticleProperties = function(properties) {
+        that.activeParticleProperties = properties;
+        sendActiveParticleProperies();
+    };
 
     return that;
 };