diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 93ce33d67..e32b56742 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -2408,7 +2408,7 @@
       let direction = $input.selectionDirection;
 
       if (event.shiftKey) {
-        if (direction === 'none') {
+        if (direction === 'none' || direction === 'forward') {
           if (isLeft) {
             direction = 'backward';
           } else {