diff --git a/lib/reline/line_editor.rb b/lib/reline/line_editor.rb
index 686a101869..81413505d7 100644
--- a/lib/reline/line_editor.rb
+++ b/lib/reline/line_editor.rb
@@ -1542,11 +1542,7 @@ def finish
   alias_method :vi_zero, :ed_move_to_beg
 
   private def ed_move_to_end(key)
-    @byte_pointer = 0
-    while @byte_pointer < current_line.bytesize
-      byte_size = Reline::Unicode.get_next_mbchar_size(current_line, @byte_pointer)
-      @byte_pointer += byte_size
-    end
+    @byte_pointer = current_line.bytesize
   end
   alias_method :end_of_line, :ed_move_to_end
 
diff --git a/lib/reline/unicode.rb b/lib/reline/unicode.rb
index 1a916b4b98..7f94e95287 100644
--- a/lib/reline/unicode.rb
+++ b/lib/reline/unicode.rb
@@ -145,7 +145,13 @@ def self.split_by_width(str, max_width, encoding = str.encoding, offset: 0)
         lines.last << NON_PRINTING_END
       when csi
         lines.last << csi
-        seq << csi
+        unless in_zero_width
+          if csi == -"\e[m" || csi == -"\e[0m"
+            seq.clear
+          else
+            seq << csi
+          end
+        end
       when osc
         lines.last << osc
         seq << osc
diff --git a/test/reline/test_unicode.rb b/test/reline/test_unicode.rb
index 834f7114c4..a9d82e2c56 100644
--- a/test/reline/test_unicode.rb
+++ b/test/reline/test_unicode.rb
@@ -38,6 +38,11 @@ def test_split_by_width
     assert_equal [["ab\e]0;1\ac", nil, "\e]0;1\ad"], 2], Reline::Unicode.split_by_width("ab\e]0;1\acd", 3)
   end
 
+  def test_split_by_width_csi_reset_sgr_optimization
+    assert_equal [["\e[1ma\e[mb\e[2mc", nil, "\e[2md\e[0me\e[3mf", nil, "\e[3mg"], 3], Reline::Unicode.split_by_width("\e[1ma\e[mb\e[2mcd\e[0me\e[3mfg", 3)
+    assert_equal [["\e[1ma\1\e[mzero\e[0m\2\e[2mb", nil, "\e[1m\e[2mc"], 2], Reline::Unicode.split_by_width("\e[1ma\1\e[mzero\e[0m\2\e[2mbc", 2)
+  end
+
   def test_take_range
     assert_equal 'cdef', Reline::Unicode.take_range('abcdefghi', 2, 4)
     assert_equal 'あde', Reline::Unicode.take_range('abあdef', 2, 4)