diff --git a/build.zig b/build.zig
index 0ac4e8b..eca093d 100644
--- a/build.zig
+++ b/build.zig
@@ -210,7 +210,6 @@ pub fn build(b: *std.Build) void {
             .{ .name = "diff", .module = diff_mod },
             .{ .name = "help.md", .module = help_mod },
             .{ .name = "CaseData", .module = zg_dep.module("CaseData") },
-            .{ .name = "code_point", .module = zg_dep.module("code_point") },
             .{ .name = "fuzzig", .module = fuzzig_dep.module("fuzzig") },
             .{ .name = "zeit", .module = zeit_mod },
         },
diff --git a/src/tui/editor.zig b/src/tui/editor.zig
index fc185b1..50071af 100644
--- a/src/tui/editor.zig
+++ b/src/tui/editor.zig
@@ -10,7 +10,6 @@ const text_manip = @import("text_manip");
 const syntax = @import("syntax");
 const project_manager = @import("project_manager");
 const CaseData = @import("CaseData");
-const code_point = @import("code_point");
 const root_mod = @import("root");
 
 const Plane = @import("renderer").Plane;
@@ -3927,10 +3926,11 @@ pub const Editor = struct {
 
     fn switch_case_cursel(self: *Self, root_: Buffer.Root, cursel: *CurSel, allocator: Allocator) error{Stop}!Buffer.Root {
         var root = root_;
-        const saved = cursel.*;
+        var saved = cursel.*;
         const sel = if (cursel.selection) |*sel| sel else ret: {
             var sel = cursel.enable_selection();
-            move_cursor_right(root, &sel.begin, self.metrics) catch return error.Stop;
+            move_cursor_right(root, &sel.end, self.metrics) catch return error.Stop;
+            saved.cursor = sel.end;
             break :ret sel;
         };
         var sfa = std.heap.stackFallback(4096, self.allocator);
@@ -3938,21 +3938,10 @@ pub const Editor = struct {
         defer allocator.free(cut_text);
         const cd = CaseData.init(allocator) catch return error.Stop;
         defer cd.deinit();
-        const flipped = blk: {
-            var bytes = std.ArrayList(u8).initCapacity(allocator, cut_text.len) catch return error.Stop;
-            defer bytes.deinit();
-
-            var iter = code_point.Iterator{ .bytes = cut_text };
-            var buf: [4]u8 = undefined;
-
-            while (iter.next()) |cp| {
-                const code = if (cd.isLower(cp.code)) cd.toUpper(cp.code) else cd.toLower(cp.code);
-                const len = std.unicode.utf8Encode(code, &buf) catch return error.Stop;
-                bytes.appendSliceAssumeCapacity(buf[0..len]);
-            }
-
-            break :blk bytes.toOwnedSlice() catch return error.Stop;
-        };
+        const flipped = (if (cd.isLowerStr(cut_text))
+            cd.toUpperStr(allocator, cut_text)
+        else
+            cd.toLowerStr(allocator, cut_text)) catch return error.Stop;
         defer allocator.free(flipped);
         root = try self.delete_selection(root, cursel, allocator);
         root = self.insert(root, cursel, flipped, allocator) catch return error.Stop;
@@ -3966,7 +3955,7 @@ pub const Editor = struct {
         try self.update_buf(root);
         self.clamp();
     }
-    pub const switch_case_meta = .{ .description = "Switch the casing of selection or cell" };
+    pub const switch_case_meta = .{ .description = "Switch the case of selection or character at cursor" };
 
     pub fn toggle_eol_mode(self: *Self, _: Context) Result {
         if (self.buffer) |b| {
diff --git a/src/tui/mode/input/flow.zig b/src/tui/mode/input/flow.zig
index b67e4d2..86892e3 100644
--- a/src/tui/mode/input/flow.zig
+++ b/src/tui/mode/input/flow.zig
@@ -148,6 +148,7 @@ fn mapPress(self: *Self, keypress: u32, egc: u32, modifiers: u32) !void {
             'P' => self.cmd("goto_prev_file_or_diagnostic", .{}),
             'U' => self.cmd("to_upper", .{}),
             'L' => self.cmd("to_lower", .{}),
+            'C' => self.cmd("switch_case", .{}),
             'I' => self.cmd("toggle_inputview", .{}),
             'B' => self.cmd("move_word_left", .{}),
             'F' => self.cmd("move_word_right", .{}),
diff --git a/src/tui/mode/input/vim/normal.zig b/src/tui/mode/input/vim/normal.zig
index 8d072a7..a12c7ef 100644
--- a/src/tui/mode/input/vim/normal.zig
+++ b/src/tui/mode/input/vim/normal.zig
@@ -212,7 +212,7 @@ fn mapPress(self: *Self, keypress: u32, egc: u32, modifiers: u32) !void {
             'o' => self.seq(.{ "smart_insert_line_before", "enter_mode" }, command.fmt(.{"vim/insert"})),
             'k' => self.cmd("hover", .{}),
 
-            '`' => self.seq(.{ "switch_case", "move_right_vim" }, .{}),
+            '`' => self.cmd("switch_case", .{}),
             else => {},
         },
         0 => switch (keypress) {