diff --git a/src/keybind/builtin/helix.json b/src/keybind/builtin/helix.json
index 1e9e063..9fb088b 100644
--- a/src/keybind/builtin/helix.json
+++ b/src/keybind/builtin/helix.json
@@ -169,12 +169,7 @@
             [";", "collapse_selections"],
             ["x", "extend_line_below"],
 
-            ["m m", "match_brackets"],
-            ["m s", "surround_add"],
-            ["m r", "surround_replace"],
-            ["m d", "surround_delete"],
-            ["m a", "select_textobject_around"],
-            ["m i", "select_textobject_inner"],
+            ["m", "match"],
 
             ["[ D", "goto_first_diag"],
             ["[ G", "goto_first_change"],
diff --git a/src/tui/mode/mini/match.zig b/src/tui/mode/mini/match.zig
new file mode 100644
index 0000000..de699c5
--- /dev/null
+++ b/src/tui/mode/mini/match.zig
@@ -0,0 +1,65 @@
+const std = @import("std");
+const cbor = @import("cbor");
+const command = @import("command");
+const tp = @import("thespian");
+const log = @import("log");
+
+const tui = @import("../../tui.zig");
+
+pub const Type = @import("get_char.zig").Create(@This());
+pub const create = Type.create;
+
+pub fn name(self: *Type) []const u8 {
+    var suffix: []const u8 = "";
+    if ((self.ctx.args.match(.{tp.extract(&suffix)}) catch false)) {
+        return suffix;
+    }
+    return "󰅪 match";
+}
+
+pub fn process_egc(self: *Type, egc: []const u8) command.Result {
+    var prev: []const u8 = "";
+    if ((self.ctx.args.match(.{tp.extract(&prev)}) catch false)) {
+        if (std.mem.eql(u8, prev, "mi")) {
+            command.executeName("select_textobject_inner", command.fmt(.{egc})) catch {
+                try command.executeName("exit_mini_mode", .{});
+            };
+        } else if (std.mem.eql(u8, prev, "ma")) {
+            command.executeName("select_textobject_around", command.fmt(.{egc})) catch {
+                try command.executeName("exit_mini_mode", .{});
+            };
+        } else if (std.mem.eql(u8, prev, "md")) {
+            command.executeName("surround_delete", command.fmt(.{egc})) catch {
+                try command.executeName("exit_mini_mode", .{});
+            };
+        } else if (std.mem.eql(u8, prev, "mr")) {
+            command.executeName("surround_replace", command.fmt(.{egc})) catch {
+                try command.executeName("exit_mini_mode", .{});
+            };
+        } else if (std.mem.eql(u8, prev, "ms")) {
+            command.executeName("surround_add", command.fmt(.{egc})) catch {
+                try command.executeName("exit_mini_mode", .{});
+            };
+        }
+        try command.executeName("exit_mini_mode", .{});
+    } else {
+        if (std.mem.eql(u8, egc, "i")) {
+            try command.executeName("match", command.fmt(.{"mi"}));
+        } else if (std.mem.eql(u8, egc, "a")) {
+            try command.executeName("match", command.fmt(.{"ma"}));
+        } else if (std.mem.eql(u8, egc, "d")) {
+            try command.executeName("match", command.fmt(.{"md"}));
+        } else if (std.mem.eql(u8, egc, "r")) {
+            try command.executeName("match", command.fmt(.{"mr"}));
+        } else if (std.mem.eql(u8, egc, "s")) {
+            try command.executeName("match", command.fmt(.{"ms"}));
+        } else if (std.mem.eql(u8, egc, "m")) {
+            command.executeName("match_brackets", .{}) catch {
+                try command.executeName("exit_mini_mode", .{});
+            };
+            try command.executeName("exit_mini_mode", .{});
+        } else {
+            try command.executeName("exit_mini_mode", .{});
+        }
+    }
+}
diff --git a/src/tui/tui.zig b/src/tui/tui.zig
index 09a8462..581baa8 100644
--- a/src/tui/tui.zig
+++ b/src/tui/tui.zig
@@ -1279,6 +1279,11 @@ const cmds = struct {
     }
     pub const underline_meta: Meta = .{ .description = "Underline with character" };
 
+    pub fn match(self: *Self, ctx: Ctx) Result {
+        return enter_mini_mode(self, @import("mode/mini/match.zig"), ctx);
+    }
+    pub const match_meta: Meta = .{ .description = "Match mode" };
+
     pub fn open_file(self: *Self, ctx: Ctx) Result {
         if (get_active_selection(self.allocator)) |text| {
             defer self.allocator.free(text);