diff --git a/assets/js/src/newsletters/listings/standard.jsx b/assets/js/src/newsletters/listings/standard.jsx
index 021d0ba92e..f6e9569e4d 100644
--- a/assets/js/src/newsletters/listings/standard.jsx
+++ b/assets/js/src/newsletters/listings/standard.jsx
@@ -97,6 +97,17 @@ const bulk_actions = [
   },
 ];
 
+const confirmEdit = (newsletter) => {
+  if(
+    !newsletter.queue
+    || newsletter.status != 'sending'
+    || newsletter.queue.status !== null
+    || window.confirm(MailPoet.I18n.t('confirmEdit'))
+  ) {
+    window.location.href = `?page=mailpoet-newsletter-editor&id=${ newsletter.id }`;
+  }
+};
+
 let newsletter_actions = [
   {
     name: 'view',
@@ -111,15 +122,7 @@ let newsletter_actions = [
   {
     name: 'edit',
     label: MailPoet.I18n.t('edit'),
-    onClick: (newsletter) => {
-      if(
-        !newsletter.queue
-        || newsletter.queue.status != 'scheduled'
-        || window.confirm(MailPoet.I18n.t('confirmEdit'))
-      ) {
-        window.location.href = `?page=mailpoet-newsletter-editor&id=${ newsletter.id }`;
-      }
-    },
+    onClick: confirmEdit,
   },
   {
     name: 'duplicate',
@@ -175,7 +178,8 @@ const NewsletterListStandard = React.createClass({
           <strong>
             <a
               className="row-title"
-              href={ `?page=mailpoet-newsletter-editor&id=${ newsletter.id }` }
+              href="javascript:;"
+              onClick={() => confirmEdit(newsletter)}
             >{ newsletter.queue.newsletter_rendered_subject || newsletter.subject }</a>
           </strong>
           { actions }
diff --git a/assets/js/src/newsletters/send.jsx b/assets/js/src/newsletters/send.jsx
index 5094aab958..82b5aeb50b 100644
--- a/assets/js/src/newsletters/send.jsx
+++ b/assets/js/src/newsletters/send.jsx
@@ -274,7 +274,9 @@ define(
                   />
                 &nbsp;
                 {
-                  this.state.item.queue && this.state.item.queue.status == 'paused'
+                  this.state.item.status == 'sending'
+                  && this.state.item.queue
+                  && this.state.item.queue.status == 'paused'
                   ? <input
                   className="button button-secondary"
                   type="button"
diff --git a/views/newsletter/editor.html b/views/newsletter/editor.html
index 760ab95a9c..e30b9d66d1 100644
--- a/views/newsletter/editor.html
+++ b/views/newsletter/editor.html
@@ -1216,7 +1216,7 @@
         config: config,
       });
       var queue = response.data.queue;
-      if (queue && queue.status == 'scheduled') {
+      if (response.data.status == 'sending' && queue && queue.status === null) {
         MailPoet.Ajax.post({
           api_version: window.mailpoet_api_version,
           endpoint: 'sending_queue',