diff --git a/Changelog.md b/Changelog.md
index f59b18d20db40912ff32100617c2eb4b2a2d0da3..652eb5d9d87743b0e2ba4eef9327f57c43bc14e2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -149,7 +149,7 @@ diaspora* no longer adds a `div.container` to wrap custom splash pages. This add
 * Disable email notifications for closed user accounts [#5640](https://github.com/diaspora/diaspora/pull/5640)
 * Total user statistic no longer includes closed accounts [#5041](https://github.com/diaspora/diaspora/pull/5041)
 * Don't add a space when rendering a mention [#5711](https://github.com/diaspora/diaspora/pull/5711)
-* Fix flickering hovercards [#5714](https://github.com/diaspora/diaspora/pull/5714)
+* Fix flickering hovercards [#5714](https://github.com/diaspora/diaspora/pull/5714) [#5876](https://github.com/diaspora/diaspora/pull/5876)
 * Improved stripping markdown in post titles [#5730](https://github.com/diaspora/diaspora/pull/5730)
 * Remove border from reply form for conversations [#5744](https://github.com/diaspora/diaspora/pull/5744)
 * Fix overflow for headings, blockquotes and other elements [#5731](https://github.com/diaspora/diaspora/pull/5731)
diff --git a/app/assets/javascripts/app/views/hovercard_view.js b/app/assets/javascripts/app/views/hovercard_view.js
index 09242bb2fff5f07bb9d51b5b249649dab39988a9..cfcf4976256c95e1835ba42db001b5c1152cf747 100644
--- a/app/assets/javascripts/app/views/hovercard_view.js
+++ b/app/assets/javascripts/app/views/hovercard_view.js
@@ -15,7 +15,7 @@ app.views.Hovercard = app.views.Base.extend({
       .on('mouseenter', '.hovercardable', _.bind(this._mouseenterHandler, this))
       .on('mouseleave', '.hovercardable', _.bind(this._mouseleaveHandler, this));
 
-    this.show_me = false;
+    this.showMe = false;
     this.parent = null;  // current 'hovercardable' element that caused HC to appear
 
     // cache some element references
@@ -54,19 +54,19 @@ app.views.Hovercard = app.views.Base.extend({
       return false;
     }
 
-    this.show_me = true;
+    this.showMe = true;
     this.showHovercardOn(el);
     return false;
   },
 
   _mouseleaveHandler: function(event) {
+    this.showMe = false;
     if( this.active === false ||
       $.contains(this.el, event.relatedTarget) ) { return false; }
 
     if( this.mouseIsOverElement(this.parent, event) ||
       this.mouseIsOverElement(this.$el, event) ) { return false; }
 
-    this.show_me = false;
     if( this.$el.is(':visible') ) {
       this.$el.fadeOut('fast');
     } else {
@@ -81,7 +81,7 @@ app.views.Hovercard = app.views.Base.extend({
     var el = $(element);
     var hc = this.$el;
 
-    if( !this.show_me ) {
+    if( !this.showMe ) {
       // mouse has left element
       return;
     }
@@ -103,6 +103,10 @@ app.views.Hovercard = app.views.Base.extend({
       }
 
       self._populateHovercardWith(person);
+      if( !self.showMe ) {
+        // mouse has left element
+        return;
+      }
       self.$el.fadeIn('fast');
     });
   },
@@ -141,13 +145,13 @@ app.views.Hovercard = app.views.Base.extend({
       left: p_pos.left
     });
   },
-  
+
   mouseIsOverElement: function(element, event) {
-    var el_pos = element.offset();
-    return event.pageX >= el_pos.left && 
-      event.pageX <= el_pos.left + element.width() &&
-      event.pageY >= el_pos.top && 
-      event.pageY <= el_pos.top + element.height();
+    var elPos = element.offset();
+    return event.pageX >= elPos.left &&
+      event.pageX <= elPos.left + element.width() &&
+      event.pageY >= elPos.top &&
+      event.pageY <= elPos.top + element.height();
   },
 });
 // @license-end