diff --git a/js/expand.js b/js/expand.js
index d0b4583c..16a0efb2 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -27,7 +27,8 @@ $(document).ready(function(){
 					success: function(data) {
 						var last_expanded = false;
 						$(data).find('div.post.reply').each(function() {
-							if(thread.find('#' + $(this).attr('id')).length == 0) {
+							var post_in_doc = thread.find('#' + $(this).attr('id'));
+							if(post_in_doc.length == 0) {
 								if(last_expanded) {
 									$(this).addClass('expanded').insertAfter(last_expanded).before('<br class="expanded">');
 								} else {
@@ -36,6 +37,9 @@ $(document).ready(function(){
 								last_expanded = $(this);
 								
 							}
+							else {
+								last_expanded = post_in_doc;
+							}
 						});
 						$('<span class="omitted"><a href="javascript:void(0)">Hide expanded replies</a>.</span>')
 							.insertAfter(thread.find('span.omitted').css('display', 'none'))