diff --git a/crates/editor/src/element.rs b/crates/editor/src/element.rs
index c89fcd577e8a496309e643f40124cf8d71ddced8..f3be5ae6e2f1a40c9aa841ad883ecb89032430a6 100644
--- a/crates/editor/src/element.rs
+++ b/crates/editor/src/element.rs
@@ -48,7 +48,7 @@ use std::{
     sync::Arc,
 };
 use text::Point;
-use workspace::{item::Item, GitGutterSetting, WorkspaceSettings};
+use workspace::item::Item;
 
 enum FoldMarkers {}
 
@@ -1048,7 +1048,7 @@ impl EditorElement {
             });
 
             if layout.is_singleton {
-                let diff_style = theme::current(cx).editor.diff.clone();
+                let diff_style = cx.global::<Settings>().theme.editor.diff.clone();
                 for hunk in layout
                     .position_map
                     .snapshot
@@ -2065,8 +2065,8 @@ impl Element<Editor> for EditorElement {
             ));
         }
 
-        let show_scrollbars = match settings::get::<EditorSettings>(cx).show_scrollbars {
-            ShowScrollbars::Auto => {
+        let show_scrollbars = match cx.global::<Settings>().show_scrollbars {
+            settings::ShowScrollbars::Auto => {
                 snapshot.has_scrollbar_info(is_singleton)
                     || editor.scroll_manager.scrollbars_visible()
             }