diff --git a/src/display-buffer.coffee b/src/display-buffer.coffee
index a1b1cd67a..637db9d0a 100644
--- a/src/display-buffer.coffee
+++ b/src/display-buffer.coffee
@@ -656,8 +656,8 @@ class DisplayBuffer extends Model
       while valueIndex < token.value.length
         if textUtils.isPairedCharacter(value, valueIndex)
           char = value.substr(valueIndex, 2)
-          valueIndex += 2
           charLength = 2
+          valueIndex += 2
         else
           char = value[valueIndex]
           charLength = 1
@@ -685,8 +685,8 @@ class DisplayBuffer extends Model
       while valueIndex < token.value.length
         if textUtils.isPairedCharacter(value, valueIndex)
           char = value.substr(valueIndex, 2)
-          valueIndex += 2
           charLength = 2
+          valueIndex += 2
         else
           char = value[valueIndex]
           charLength = 1
diff --git a/src/lines-component.coffee b/src/lines-component.coffee
index 38f6447f2..07d315c2c 100644
--- a/src/lines-component.coffee
+++ b/src/lines-component.coffee
@@ -316,8 +316,8 @@ LinesComponent = React.createClass
       while valueIndex < value.length
         if textUtils.isPairedCharacter(value, valueIndex)
           char = value.substr(valueIndex, 2)
-          valueIndex += 2
           charLength = 2
+          valueIndex += 2
         else
           char = value[valueIndex]
           charLength = 1