diff --git a/4chan_x.user.js b/4chan_x.user.js
index 4702d7875..4ebeb994d 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -6319,7 +6319,10 @@
         QR.status();
         return;
       }
-      QR.abort();
+      if (QR.ajax) {
+        QR.abort();
+        return;
+      }
       reply = QR.replies[0];
       if (g.BOARD.ID === 'f' && g.VIEW === 'index') {
         filetag = QR.threadSelector.value;
diff --git a/changelog b/changelog
index adbd8df91..f0c6d481d 100644
--- a/changelog
+++ b/changelog
@@ -11,6 +11,7 @@ beta
     Can be auto-hidden.
 
   QR changes:
+    Clicking the submit button while uploading will abort the upload and won't start re-uploading automatically anymore.
     Creating threads outside of the index is now possible.
     Selection-to-quote also applies to selected text inside the post, not just inside the comment.
     Quoting the OP will not insert the >>opnumber anymore unless the QR was already opened.
diff --git a/src/qr.coffee b/src/qr.coffee
index 58a517f6f..a26a87ff2 100644
--- a/src/qr.coffee
+++ b/src/qr.coffee
@@ -626,7 +626,10 @@ QR =
       QR.cooldown.auto = !QR.cooldown.auto
       QR.status()
       return
-    QR.abort()
+
+    if QR.ajax
+      QR.abort()
+      return
 
     reply = QR.replies[0]
     if g.BOARD.ID is 'f' and g.VIEW is 'index'