diff --git a/src/less/submissions.less b/src/less/submissions.less
index 726f84da..b0a3676d 100644
--- a/src/less/submissions.less
+++ b/src/less/submissions.less
@@ -70,6 +70,11 @@
 		vertical-align: top;
 	}
 
+	#afchEditConflict {
+		display: none;
+		color: red;
+	}
+
 	#afchSubmitForm {
 		text-align: center;
 		width: 30%;
diff --git a/src/modules/submissions.js b/src/modules/submissions.js
index 6a0e15e5..28eea6a0 100644
--- a/src/modules/submissions.js
+++ b/src/modules/submissions.js
@@ -1367,10 +1367,18 @@
 				// Also provide extra data
 				$.extend( data, extraData );
 
-				prepareForProcessing();
+				checkForEditConflict().then( function ( editConflict ) {
+					if ( editConflict ) {
+						showEditConflictMessage();
+						return;
+					}
 
-				// Now finally call the applicable handler
-				fn( data );
+					// Hide the HTML form. Show #afchStatus messages
+					prepareForProcessing();
+
+					// Now finally call the applicable handler
+					fn( data );
+				} );
 			} );
 		} );
 	}
@@ -2608,6 +2616,42 @@
 		} );
 	}
 
+	function checkForEditConflict() {
+		// Get all revisions since the page was loaded, starting with the revision of the loaded page
+		var request = {
+			action: 'query',
+			format: 'json',
+			prop: 'revisions',
+			titles: [ mw.config.get( 'wgPageName' ) ],
+			formatversion: 2,
+			rvstartid: mw.config.get( 'wgRevisionId' ),
+			rvdir: 'newer'
+		};
+		var promise = AFCH.api.postWithEditToken( request )
+			.then( function ( data ) {
+				var revisions = data.query.pages[ 0 ].revisions;
+				// 1 revision = no edit conflict, 2+ revisions = edit conflict.
+				if ( revisions && revisions.length > 1 ) {
+					return true;
+				}
+				return false;
+			} );
+		return promise;
+	}
+
+	function showEditConflictMessage() {
+		$( '#afchSubmitForm' ).hide();
+
+		// Putting this here instead of in tpl-submissions.html to reduce code duplication
+		var editConflictHtml = 'Edit conflict! Your changes were not saved. Please check the <a id="afchHistoryLink" href="">page history</a>. To avoid overwriting the other person\'s edits, please refresh this page and start again.';
+		$( '#afchEditConflict' ).html( editConflictHtml );
+
+		var historyLink = new mw.Uri( mw.util.getUrl( mw.config.get( 'wgPageName' ), { action: 'history' } ) );
+		$( '#afchHistoryLink' ).prop( 'href', historyLink );
+
+		$( '#afchEditConflict' ).show();
+	}
+
 	function handleComment( data ) {
 		var text = data.afchText;
 
diff --git a/src/templates/tpl-submissions.html b/src/templates/tpl-submissions.html
index 80a34d2d..0f24ad56 100644
--- a/src/templates/tpl-submissions.html
+++ b/src/templates/tpl-submissions.html
@@ -169,6 +169,8 @@
 			<input type="checkbox" id="notifyUser" class="afch-input" checked/>
 		</div>
 
+		<div id="afchEditConflict"></div>
+
 		<div id="afchSubmitForm" data-running="Accepting submission..." class="gradient-button accept">Accept &amp; publish</div>
 
 	</div>
@@ -304,6 +306,8 @@
 			</div>
 		</div>
 
+		<div id="afchEditConflict"></div>
+
 		<div id="afchSubmitForm" data-running="Declining submission..." class="gradient-button button-centered decline hidden">Decline submission</div>
 
 	</div>
@@ -321,10 +325,12 @@
 
 		<div id="commentPreview"></div>
 
-	<div class="afch-option">
-		<input type="checkbox" id="notifyUser" class="afch-input" {{#notifyByDefault}}checked{{/notifyByDefault}} />
-		<label for="notifyUser" class="afch-label">Notify submitter</label>
-	</div>
+		<div class="afch-option">
+			<input type="checkbox" id="notifyUser" class="afch-input" {{#notifyByDefault}}checked{{/notifyByDefault}} />
+			<label for="notifyUser" class="afch-label">Notify submitter</label>
+		</div>
+
+		<div id="afchEditConflict"></div>
 
 		<div id="afchSubmitForm" data-running="Commenting on submission..." class="gradient-button button-centered comment">Post comment</div>
 
@@ -351,6 +357,8 @@
 			<div id="submitterNameStatus" class="error"></div>
 		</div>
 
+		<div id="afchEditConflict"></div>
+
 		<div id="afchSubmitForm" data-running="Submitting..." class="gradient-button button-centered submit">Submit</div>
 
 	</div>
@@ -365,10 +373,11 @@
 			placeholder="Enter your rationale for postponing deletion, which will be added to the submission as a new comment."
 			cols="100" rows="5"></textarea>
 
+		<div id="afchEditConflict"></div>
+
 		<div id="afchSubmitForm" data-running="Postponing..." class="gradient-button button-centered postpone-g13">
 			Postpone deletion
 		</div>
-
 	</div>
 </div>
 <!-- /postpone-g13 -->