diff --git a/app/soapbox/components/profile_hover_card.js b/app/soapbox/components/profile_hover_card.js
index c6319d38b..c62a36422 100644
--- a/app/soapbox/components/profile_hover_card.js
+++ b/app/soapbox/components/profile_hover_card.js
@@ -11,6 +11,7 @@ import Badge from 'soapbox/components/badge';
 import classNames from 'classnames';
 import { fetchRelationships } from 'soapbox/actions/accounts';
 import { usePopper } from 'react-popper';
+import { clearProfileHoverCard } from 'soapbox/actions/profile_hover_card';
 
 const getAccount = makeGetAccount();
 
@@ -22,13 +23,19 @@ const getBadges = (account) => {
   return badges;
 };
 
+const handleMouseLeave = (dispatch) => {
+  return e => {
+    dispatch(clearProfileHoverCard());
+  };
+};
+
 export const ProfileHoverCard = ({ visible }) => {
   const dispatch = useDispatch();
 
   const [popperElement, setPopperElement] = useState(null);
 
   const accountId = useSelector(state => state.getIn(['profile_hover_card', 'accountId']));
-  const account = useSelector(state => accountId && getAccount(state, accountId));
+  const account   = useSelector(state => accountId && getAccount(state, accountId));
   const targetRef = useSelector(state => state.getIn(['profile_hover_card', 'ref']));
   const badges = account ? getBadges(account) : [];
 
@@ -36,14 +43,21 @@ export const ProfileHoverCard = ({ visible }) => {
     if (accountId) dispatch(fetchRelationships([accountId]));
   }, [dispatch, accountId]);
 
-  const { styles, attributes } = usePopper(targetRef, popperElement);
+  const { styles, attributes } = usePopper(targetRef, popperElement, {
+    modifiers: [{
+      name: 'offset',
+      options: {
+        offset: [-100, 0],
+      },
+    }],
+  });
 
   if (!account) return null;
   const accountBio = { __html: account.get('note_emojified') };
   const followedBy  = account.getIn(['relationship', 'followed_by']);
 
   return (
-    <div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })} ref={setPopperElement} style={styles.popper} {...attributes.popper}>
+    <div className={classNames('profile-hover-card', { 'profile-hover-card--visible': visible })} ref={setPopperElement} style={styles.popper} {...attributes.popper} onMouseLeave={handleMouseLeave(dispatch)}>
       <div className='profile-hover-card__container'>
         {followedBy &&
           <span className='relationship-tag'>
diff --git a/app/soapbox/components/status.js b/app/soapbox/components/status.js
index e81ed9ccb..275603bcc 100644
--- a/app/soapbox/components/status.js
+++ b/app/soapbox/components/status.js
@@ -108,7 +108,6 @@ class Status extends ImmutablePureComponent {
   state = {
     showMedia: defaultMediaVisibility(this.props.status, this.props.displayMedia),
     statusId: undefined,
-    profileCardVisible: false,
   };
 
   // Track height changes we know about to compensate scrolling
@@ -268,7 +267,6 @@ class Status extends ImmutablePureComponent {
   handleProfileLeave = e => {
     this.showProfileHoverCard.cancel();
     this.props.onClearProfileHoverCard();
-    this.setState({ profileCardVisible: false });
   }
 
   _properStatus() {
diff --git a/app/styles/components/profile_hover_card.scss b/app/styles/components/profile_hover_card.scss
index ded79b5f5..47a5242a2 100644
--- a/app/styles/components/profile_hover_card.scss
+++ b/app/styles/components/profile_hover_card.scss
@@ -125,3 +125,9 @@
     display: block;
   }
 }
+
+/* Hide the popper when the reference is hidden */
+#popper[data-popper-reference-hidden] {
+  visibility: hidden;
+  pointer-events: none;
+}