diff --git a/js/post-hover.js b/js/post-hover.js
index e8b0c9b0..808570c5 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -21,9 +21,15 @@ $(document).ready(function(){
 		}
 		
 		var post = false;
+		var hovering = false;
 		$(this).hover(function(e) {
+			hovering = true;
+			
 			var start_hover = function(link) {
-				if(post.is(':visible') && $(window).scrollTop() <= post.offset().top + post.height()) {
+				if(post.is(':visible') &&
+						post.offset().top + post.height() >= $(window).scrollTop() &&
+						post.offset().top <= $(window).scrollTop() + $(window).height()
+						) {
 					// post is in view
 					post.attr('style', 'border-style: none dashed dashed none; background: ' + post.css('border-right-color'));
 				} else {
@@ -44,6 +50,7 @@ $(document).ready(function(){
 			};
 			
 			post = $('div.post#reply_' + id);
+			console.log(post);
 			if(post.length > 0) {
 				start_hover(this);
 			} else {
@@ -63,13 +70,16 @@ $(document).ready(function(){
 								.find('div.post#reply_' + id);
 						if(typeof window.enable_fa == 'function' && localStorage['forcedanon']) 
 							enable_fa();
-						start_hover(link);
+						if(hovering)
+							start_hover(link);
 					}
 				});
 			}
 		}, function() {
+			hovering = false;
 			if(!post)
 				return;
+			
 			post.attr('style', '');
 			if(post.hasClass('hidden'))
 				post.css('display', 'none');