diff --git a/src/config.zig b/src/config.zig
index ce68d21..c16ee16 100644
--- a/src/config.zig
+++ b/src/config.zig
@@ -47,7 +47,7 @@ bottom_bar: []const u8 = "mode file log selection diagnostics keybind branch lin
 show_scrollbars: bool = true,
 show_fileicons: bool = true,
 show_local_diagnostics_in_panel: bool = false,
-scrollbar_auto_hide: bool = true,
+scrollbar_auto_hide: bool = false,
 
 start_debugger_on_crash: bool = false,
 
diff --git a/src/tui/editor.zig b/src/tui/editor.zig
index e8fe901..7472990 100644
--- a/src/tui/editor.zig
+++ b/src/tui/editor.zig
@@ -6264,11 +6264,11 @@ pub const Editor = struct {
     pub const highlight_references_meta: Meta = .{ .description = "Language: Highlight references" };
 
     pub fn add_highlight_reference(self: *Self, match_: Match) void {
+        self.match_type = .highlight_references;
         if (self.highlight_references_state == .done) {
             self.highlight_references_state = .adding;
             self.cancel_all_matches();
         }
-        self.match_type = .highlight_references;
         const root = self.buf_root() catch return;
         var match = match_;
         match.begin.row -|= 1;
@@ -6954,9 +6954,7 @@ pub const EditorWidget = struct {
         switch (self.editor.match_type) {
             .find, .auto_find => return,
             .highlight_references => {
-                if (self.editor.match_at_cursor(primary.cursor)) |_| {
-                    return;
-                } else {
+                if (self.editor.match_at_cursor(primary.cursor) == null) {
                     self.editor.cancel_all_matches();
                     tui.need_render();
                 }