Index: src/wp-admin/js/post.js
===================================================================
--- src/wp-admin/js/post.js	(revision 31141)
+++ src/wp-admin/js/post.js	(working copy)
@@ -710,7 +710,7 @@
 				$timestampdiv.find('.timestamp-wrap').removeClass('form-invalid');
 			}
 
-			if ( attemptedDate > currentDate && $('#original_post_status').val() != 'future' ) {
+			if ( attemptedDate > currentDate ) {
 				publishOn = postL10n.publishOnFuture;
 				$('#publish').val( postL10n.schedule );
 			} else if ( attemptedDate <= currentDate && $('#original_post_status').val() != 'publish' ) {