diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
index 216b914..7c10c82 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.cs
@@ -79,7 +79,7 @@ public partial class SharpIdeCodeEdit : CodeEdit
 		SymbolValidate += OnSymbolValidate;
 		SymbolLookup += OnSymbolLookup;
 		LinesEditedFrom += OnLinesEditedFrom;
-		MouseEntered += GrabFocus; // fixes symbol hover not appearing when e.g. solution explorer is focused. Same as godot editor
+		MouseEntered += () => GrabFocus(true); // fixes symbol hover not appearing when e.g. solution explorer is focused. Same as godot editor
 		GlobalEvents.Instance.SolutionAltered.Subscribe(OnSolutionAltered);
 		SetCodeRegionTags("#region", "#endregion");
 		//AddGitGutter();
@@ -282,7 +282,7 @@ public partial class SharpIdeCodeEdit : CodeEdit
 		SetCaretColumn(column);
 		Callable.From(() =>
 		{
-			GrabFocus();
+			GrabFocus(true);
 			AdjustViewportToCaret();
 		}).CallDeferred();
 	}
diff --git a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.tscn b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.tscn
index 205e727..add6b12 100644
--- a/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.tscn
+++ b/src/SharpIDE.Godot/Features/CodeEditor/SharpIdeCodeEdit.tscn
@@ -16,14 +16,11 @@ corner_radius_bottom_right = 3
 corner_radius_bottom_left = 3
 corner_detail = 5
 
-[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_7ptyn"]
-
 [node name="SharpIdeCodeEdit" type="CodeEdit" unique_id=2021737984]
 theme_override_colors/current_line_color = Color(0.0588235, 0.0588235, 0.0588235, 1)
 theme_override_fonts/font = ExtResource("1_s7ira")
 theme_override_font_sizes/font_size = 18
 theme_override_styles/normal = SubResource("StyleBoxFlat_v06ln")
-theme_override_styles/focus = SubResource("StyleBoxEmpty_7ptyn")
 highlight_all_occurrences = true
 highlight_current_line = true
 symbol_lookup_on_click = true
diff --git a/src/SharpIDE.Godot/project.godot b/src/SharpIDE.Godot/project.godot
index ca32eef..a691f87 100644
--- a/src/SharpIDE.Godot/project.godot
+++ b/src/SharpIDE.Godot/project.godot
@@ -36,6 +36,10 @@ project/assembly_name="SharpIDE.Godot"
 
 enabled=PackedStringArray("res://addons/R3.Godot/plugin.cfg", "res://addons/csharp_gdextension_bindgen/plugin.cfg")
 
+[gui]
+
+common/show_focus_state_on_pointer_event=0
+
 [input]
 
 CodeFixes={