diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx
index 65796814ea..491cd493e8 100644
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@@ -74,7 +74,7 @@ const NewsletterSend = React.createClass({
   },
   saveTemplate: function saveTemplate(response, done) {
     fromUrl(response.meta.preview_url)
-      .then(function saveTemplateAjax(thumbnail) {
+      .then((thumbnail) => {
         MailPoet.Ajax.post({
           api_version: window.mailpoet_api_version,
           endpoint: 'newsletterTemplates',
@@ -88,6 +88,9 @@ const NewsletterSend = React.createClass({
           },
         }).then(done).fail((err) => {
           this.showError(err);
+          this.setState({ loading: false });
+          MailPoet.Modal.loading(false);
+          done();
         });
       })
       .catch((err) => {
diff --git a/lib/Router/Endpoints/ViewInBrowser.php b/lib/Router/Endpoints/ViewInBrowser.php
index 7e8a961d63..6fcf6df0b5 100644
--- a/lib/Router/Endpoints/ViewInBrowser.php
+++ b/lib/Router/Endpoints/ViewInBrowser.php
@@ -101,4 +101,4 @@ class ViewInBrowser {
     status_header(404);
     exit;
   }
-}
\ No newline at end of file
+}