diff --git a/mu4e/mu4e-actions.el b/mu4e/mu4e-actions.el
index 7f145a14..790e2b00 100644
--- a/mu4e/mu4e-actions.el
+++ b/mu4e/mu4e-actions.el
@@ -299,13 +299,17 @@ store your org-contacts."
 
 (defun mu4e-action-show-thread (msg)
   "Show all messages that are in the same thread as the message
-at point."
+at point.  Point remains on the message with the message-id where
+the action was invoked.  If invoked in view-mode, continue to
+display the message."
   (let ((msgid (mu4e-message-field msg :message-id)))
     (when msgid
       (let ((mu4e-headers-show-threads t)
 	     (mu4e-headers-include-related t))
         (mu4e-headers-search
-         (format "msgid:%s" msgid))))))
+         (format "msgid:%s" msgid)
+         nil nil nil
+         msgid (eq major-mode 'mu4e-view-mode))))))
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;