diff --git a/app/javascript/mastodon/components/status.js b/app/javascript/mastodon/components/status.js
index 3561611f747b3..2d82b90771cb0 100644
--- a/app/javascript/mastodon/components/status.js
+++ b/app/javascript/mastodon/components/status.js
@@ -172,6 +172,19 @@ class Status extends ImmutablePureComponent {
     this._openProfile(proper);
   }
 
+  handleQuoteAccountClick = e => {
+    e.preventDefault();
+
+    const { router } = this.context;
+    const status = this._properStatus();
+
+    if (!router) {
+      return;
+    }
+
+    router.history.push(`/@${status.get('quote').getIn(['account', 'acct'])}`);
+  }
+
   handleQuoteClick = () => {
     if (!this.context.router) {
       return;
@@ -641,7 +654,7 @@ class Status extends ImmutablePureComponent {
         quote = (
           <div className={classNames('quote-status', `status-${quote_status.get('visibility')}`, { muted: this.props.muted })} data-id={quote_status.get('id')}>
             <div className='status__info'>
-              <a onClick={this.handleAccountClick} target='_blank' data-id={quote_status.getIn(['account', 'id'])} href={quote_status.getIn(['account', 'url'])} title={quote_status.getIn(['account', 'acct'])} className='status__display-name'>
+              <a onClick={this.handleQuoteAccountClick} target='_blank' data-id={quote_status.getIn(['account', 'id'])} href={quote_status.getIn(['account', 'url'])} title={quote_status.getIn(['account', 'acct'])} className='status__display-name'>
                 <div className='status__avatar'><Avatar account={quote_status.get('account')} size={18} /></div>
                 <DisplayName account={quote_status.get('account')} />
               </a>