diff --git a/AppKit/CPTextView/CPTextView.j b/AppKit/CPTextView/CPTextView.j
index f1936bcb3..07389aa84 100644
--- a/AppKit/CPTextView/CPTextView.j
+++ b/AppKit/CPTextView/CPTextView.j
@@ -1868,15 +1868,16 @@ var kDelegateRespondsTo_textShouldBeginEditing
             break;
         case CPSelectByParagraph:
             regex = [[self class] _paragraphBoundaryRegex];
+
+            // triple click right in last line of a paragraph-> select this paragraph completely
+            if (loc > 0 && _isNewlineCharacter([string characterAtIndex:loc]))
+                loc--;
+
             break;
         default:
             return proposedRange;
     }
 
-    // triple click right in last line of a paragraph-> select this paragraph completely
-    if (loc > 0 && _isNewlineCharacter([string characterAtIndex:loc]))
-        loc--;
-
     var granularRange = [self _characterRangeForIndex:loc inRange:proposedRange asDefinedByRegex:regex skip:YES];
 
     if (proposedRange.length == 0 && _isNewlineCharacter([string characterAtIndex:proposedRange.location]))