diff --git a/assets/admin.js b/assets/admin.js
index 5ca8dfcf..18283a4a 100755
--- a/assets/admin.js
+++ b/assets/admin.js
@@ -185,6 +185,11 @@
 				diffClass = 'maxlength-remaining-short';
 			}
 			$counter.removeClass('maxlength-remaining-short').addClass(diffClass).html(diff);
+
+			if (diff <= 1) {
+				$(this).val( $(this).val.substring(0, $(this).data('maxlength')) );
+			}
+
 		}).change();
 		
 		$('.broadcast-interstitial .broadcast-edit a.tweet-reply-link').click(function(e) {