diff --git a/helix-core/src/syntax.rs b/helix-core/src/syntax.rs
index 6d6fe648b..e108d030b 100644
--- a/helix-core/src/syntax.rs
+++ b/helix-core/src/syntax.rs
@@ -65,12 +65,14 @@ impl LanguageConfiguration {
             .get_or_init(|| {
                 // let name = get_language_name(&self.language_id);
 
+                let root = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
+
                 let highlights_query =
-                    std::fs::read_to_string(self.path.join("queries/highlights.scm"))
+                    std::fs::read_to_string(root.join(&self.path).join("queries/highlights.scm"))
                         .unwrap_or_default();
 
                 let injections_query =
-                    std::fs::read_to_string(self.path.join("queries/injections.scm"))
+                    std::fs::read_to_string(root.join(&self.path).join("queries/injections.scm"))
                         .unwrap_or_default();
 
                 let locals_query = "";
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 67f5cf841..726d0d95f 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -233,7 +233,7 @@ impl EditorView {
                 // TODO: render also if only one of the ranges is in viewport
                 let mut start = view.screen_coords_at_pos(doc, text, selection.anchor);
                 let mut end = view.screen_coords_at_pos(doc, text, selection.head);
-                   
+
                 let head = end;
 
                 if selection.head < selection.anchor {
@@ -282,7 +282,7 @@ impl EditorView {
                         selection_style,
                     );
                 }
-                    
+
                 // cursor
                 if let Some(head) = head {
                     surface.set_style(