diff --git a/scripts/system/html/js/SnapshotReview.js b/scripts/system/html/js/SnapshotReview.js
index b7380e83c9..ed290e9756 100644
--- a/scripts/system/html/js/SnapshotReview.js
+++ b/scripts/system/html/js/SnapshotReview.js
@@ -83,7 +83,7 @@ function addImage(image_data, isGifLoading, canShare, isShowingPreviousImages, b
     }
     if (!isGifLoading && !isShowingPreviousImages && canShare) {
         shareForUrl(id);
-    } else if (isShowingPreviousImages && canShare) {
+    } else if (isShowingPreviousImages && canShare && image_data.story_id) {
         appendShareBar(id, image_data.story_id, isGif, blastButtonDisabled, hifiButtonDisabled)
     }
 }
@@ -241,7 +241,7 @@ function handleCaptureSetting(setting) {
 window.onload = function () {
     // Uncomment the line below to test functionality in a browser.
     // See definition of "testInBrowser()" to modify tests.
-    testInBrowser(false);
+    //testInBrowser(false);
     openEventBridge(function () {
         // Set up a handler for receiving the data, and tell the .js we are ready to receive it.
         EventBridge.scriptEventReceived.connect(function (message) {
@@ -280,18 +280,18 @@ window.onload = function () {
                     if (messageOptions.containsGif) {
                         if (messageOptions.processingGif) {
                             imageCount = message.image_data.length + 1; // "+1" for the GIF that'll finish processing soon
-                            message.image_data.unshift({ localPath: messageOptions.loadingGifPath });
+                            message.image_data.push({ localPath: messageOptions.loadingGifPath });
                             message.image_data.forEach(function (element, idx, array) {
-                                addImage(element, idx === 0, messageOptions.canShare, false);
+                                addImage(element, idx === 1, idx === 0 && messageOptions.canShare, false);
                             });
                         } else {
                             var gifPath = message.image_data[0].localPath;
-                            var p0img = document.getElementById('p0img');
-                            p0img.src = gifPath;
+                            var p1img = document.getElementById('p1img');
+                            p1img.src = gifPath;
 
-                            paths[0] = gifPath;
+                            paths[1] = gifPath;
                             if (messageOptions.canShare) {
-                                shareForUrl("p0");
+                                shareForUrl("p1");
                             }
                         }
                     } else {
@@ -306,7 +306,7 @@ window.onload = function () {
                     break;
                 case 'snapshotUploadComplete':
                     var isGif = message.image_url.split('.').pop().toLowerCase() === "gif";
-                    appendShareBar(isGif || imageCount === 1 ? "p0" : "p1", message.story_id, isGif);
+                    appendShareBar(isGif ? "p1" : "p0", message.story_id, isGif);
                     break;
                 default:
                     console.log("Unknown message action received in SnapshotReview.js.");
diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js
index d8635dcb03..b2d39484b0 100644
--- a/scripts/system/snapshot.js
+++ b/scripts/system/snapshot.js
@@ -317,14 +317,6 @@ function onButtonClicked() {
             shouldUpload: false
         }
         imageData = [];
-        if (previousAnimatedSnapPath !== "") {
-            imageData.push({
-                localPath: previousAnimatedSnapPath,
-                story_id: previousAnimatedSnapStoryID,
-                blastButtonDisabled: previousAnimatedSnapBlastingDisabled,
-                hifiButtonDisabled: previousAnimatedSnapHifiSharingDisabled
-            });
-        }
         if (previousStillSnapPath !== "") {
             imageData.push({
                 localPath: previousStillSnapPath,
@@ -333,6 +325,14 @@ function onButtonClicked() {
                 hifiButtonDisabled: previousStillSnapHifiSharingDisabled
             });
         }
+        if (previousAnimatedSnapPath !== "") {
+            imageData.push({
+                localPath: previousAnimatedSnapPath,
+                story_id: previousAnimatedSnapStoryID,
+                blastButtonDisabled: previousAnimatedSnapBlastingDisabled,
+                hifiButtonDisabled: previousAnimatedSnapHifiSharingDisabled
+            });
+        }
         tablet.gotoWebScreen(SNAPSHOT_REVIEW_URL);
         tablet.webEventReceived.connect(onMessage);
         HMD.openTablet();