diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6
index 6031288a772..fa840dfcdc4 100644
--- a/app/assets/javascripts/discourse/controllers/composer.js.es6
+++ b/app/assets/javascripts/discourse/controllers/composer.js.es6
@@ -301,6 +301,14 @@ export default Ember.Controller.extend({
         currentUser.set('reply_count', currentUser.get('reply_count') + 1);
       }
 
+      const disableJumpReply = Discourse.User.currentProp('disable_jump_reply');
+      if (!composer.get('replyingToTopic') || !disableJumpReply) {
+        const post = result.target;
+        if (post && !staged) {
+          DiscourseURL.routeTo(post.get('url'));
+        }
+      }
+
     }).catch(function(error) {
       composer.set('disableDrafts', false);
       self.appEvents.one('composer:opened', () => bootbox.alert(error));