diff --git a/editor/embedapi.html b/editor/embedapi.html
index cea5cfcd..41b67985 100644
--- a/editor/embedapi.html
+++ b/editor/embedapi.html
@@ -38,10 +38,20 @@
         function saveSvg() {
             svgCanvas.getSvgString()(handleSvgData);
         }
+		
+		function exportSvg() {
+			var str = document.getElementById('svgedit').contentWindow.svgEditor.uiStrings.notification.loadingImage;
+			var exportWindow = window.open(
+				'data:text/html;charset=utf-8,' + encodeURIComponent('<title>' + str + '</title><h1>' + str + '</h1>'),
+				'svg-edit-exportWindow'
+			);
+			svgCanvas.rasterExport('JPEG', null, exportWindow.name);
+		}
         
         // Add event handlers
         $('#load').click(loadSvg);
         $('#save').click(saveSvg);
+		$('#export').click(exportSvg);
 		$('body').append(
 			$('<iframe src="svg-editor.html?extensions=ext-xdomain-messaging.js' +
 				window.location.href.replace(/\?(.*)$/, '&$1') + // Append arguments to this file onto the iframe
@@ -54,6 +64,7 @@
 <body>
     <button id="load">Load example</button>
     <button id="save">Save data</button>
+	<button id="export">Export data</button>
     <br/>
 </body>
 </html>
diff --git a/editor/svg-editor.js b/editor/svg-editor.js
index aefb4925..6cd3667a 100644
--- a/editor/svg-editor.js
+++ b/editor/svg-editor.js
@@ -201,6 +201,20 @@ TODOS
 				});
 			}
 		}
+		
+		function checkCanvg (callCanvg) {
+			return function (win, data) {
+				if (window.canvg) {
+					callCanvg(win, data);
+				} else { // Might not be set up yet 
+					$.getScript('canvg/rgbcolor.js', function() {
+						$.getScript('canvg/canvg.js', function() {
+							callCanvg(win, data);
+						});
+					});
+				}
+			};
+		}
 
 		/**
 		* EXPORTS
@@ -406,7 +420,7 @@ TODOS
 					svgCanvas.bind('saved', opts.save);
 				}
 				if (opts.exportImage) {
-					svgCanvas.bind('exported', opts.exportImage);
+					svgCanvas.bind('exported', checkCanvg(opts.exportImage));
 				}
 				customHandlers = opts;
 			});
@@ -1099,6 +1113,7 @@ TODOS
 					type = data.type || 'PNG',
 					dataURLType = (type === 'ICO' ? 'BMP' : type).toLowerCase();
 
+				exportWindow = window.open('', data.exportWindowName); // A hack to get the window via JSON-able name without opening a new one
 				if (!$('#export_canvas').length) {
 					$('<canvas>', {id: 'export_canvas'}).hide().appendTo('body');
 				}
@@ -1122,6 +1137,7 @@ TODOS
 				}
 				c.width = svgCanvas.contentW;
 				c.height = svgCanvas.contentH;
+				
 				canvg(c, data.svg, {renderCallback: function() {
 					var datauri = data.quality ? c.toDataURL('image/' + dataURLType, data.quality) : c.toDataURL('image/' + dataURLType);
 					exportWindow.location.href = datauri;
@@ -2880,7 +2896,7 @@ TODOS
 			svgCanvas.bind('transition', elementTransition);
 			svgCanvas.bind('changed', elementChanged);
 			svgCanvas.bind('saved', saveHandler);
-			svgCanvas.bind('exported', exportHandler);
+			svgCanvas.bind('exported', checkCanvg(exportHandler));
 			svgCanvas.bind('zoomed', zoomChanged);
 			svgCanvas.bind('contextset', contextChanged);
 			svgCanvas.bind('extension_added', extAdded);
@@ -3631,19 +3647,12 @@ TODOS
 					if (!customHandlers.exportImage) {
 						var str = uiStrings.notification.loadingImage;
 						exportWindow = window.open(
-							'data:text/html;charset=utf-8,' + encodeURIComponent('<title>' + str + '</title><h1>' + str + '</h1>')
+							'data:text/html;charset=utf-8,' + encodeURIComponent('<title>' + str + '</title><h1>' + str + '</h1>'),
+							'svg-edit-exportWindow'
 						);
 					}
 					var quality = parseInt($('#image-slider').val(), 10)/100;
-					if (window.canvg) {
-						svgCanvas.rasterExport(imgType, quality);
-					} else {
-						$.getScript('canvg/rgbcolor.js', function() {
-							$.getScript('canvg/canvg.js', function() {
-								svgCanvas.rasterExport(imgType, quality);
-							});
-						});
-					}
+					svgCanvas.rasterExport(imgType, quality, (exportWindow && exportWindow.name));
 				}, function () {
 					var sel = $(this);
 					if (sel.val() === 'JPEG' || sel.val() === 'WEBP') {
diff --git a/editor/svgcanvas.js b/editor/svgcanvas.js
index a283ecbc..14ddabbc 100644
--- a/editor/svgcanvas.js
+++ b/editor/svgcanvas.js
@@ -4332,7 +4332,7 @@ this.save = function(opts) {
 // Function: rasterExport
 // Generates a Data URL based on the current image, then calls "exported" 
 // with an object including the string, image information, and any issues found
-this.rasterExport = function(imgType, quality) {
+this.rasterExport = function(imgType, quality, exportWindowName) {
 	var mimeType = 'image/' + imgType.toLowerCase();
 
 	// remove the selected outline before serializing
@@ -4361,7 +4361,7 @@ this.rasterExport = function(imgType, quality) {
 	});
 
 	var str = this.svgCanvasToString();
-	call('exported', {svg: str, issues: issues, type: imgType, mimeType: mimeType, quality: quality});
+	call('exported', {svg: str, issues: issues, type: imgType, mimeType: mimeType, quality: quality, exportWindowName: exportWindowName});
 };
 
 // Function: getSvgString
