plotly
diff --git a/‎src/plot_api/plot_api.js
Copy file name to clipboardExpand all lines: src/plot_api/plot_api.js
+12-2Lines changed: 12 additions & 2 deletions b/‎src/plot_api/plot_api.js
Copy file name to clipboardExpand all lines: src/plot_api/plot_api.js
+12-2Lines changed: 12 additions & 2 deletions
diff --git a/‎src/snapshot/index.js
Copy file name to clipboardExpand all lines: src/snapshot/index.js
-4Lines changed: 0 additions & 4 deletions b/‎src/snapshot/index.js
Copy file name to clipboardExpand all lines: src/snapshot/index.js
-4Lines changed: 0 additions & 4 deletions
@@ -364,15 +364,24 @@ Plotly.plot = function(gd, data, layout, config) {
         // source links
         Plots.addLinks(gd);
 
+        // Mark the first render as complete
+        gd._replotting = false;
+
         return Plots.previousPromises(gd);
     }
 
+    function finalDraw(){
+        Shapes.drawAll(gd);
+        Plotly.Annotations.drawAll(gd);
+        Legend.draw(gd);
+    }
+
     function cleanUp() {
         // now we're REALLY TRULY done plotting...
         // so mark it as done and let other procedures call a replot
-        gd._replotting = false;
         Lib.markTime('done plot');
         gd.emit('plotly_afterplot');
+
     }
 
     var donePlotting = Lib.syncOrAsync([
@@ -382,7 +391,8 @@ Plotly.plot = function(gd, data, layout, config) {
         marginPushersAgain,
         positionAndAutorange,
         drawAxes,
-        drawData
+        drawData,
+        finalDraw
     ], gd, cleanUp);
 
     // even if everything we did was synchronous, return a promise
 
@@ -9,8 +9,6 @@
 
 'use strict';
 
-var Plotly = require('../plotly');
-
 function getDelay(fullLayout) {
     return (fullLayout._hasGL3D || fullLayout._hasGL2D) ? 500 : 0;
 }
@@ -24,8 +22,6 @@ function getRedrawFunc(gd) {
             (gd.data && gd.data[0] && gd.data[0].r)
         ) return;
 
-        Plotly.Annotations.drawAll(gd);
-        Plotly.Legend.draw(gd, fullLayout.showlegend);
         (gd.calcdata || []).forEach(function(d) {
             if(d[0] && d[0].t && d[0].t.cb) d[0].t.cb();
         });