diff --git a/TODO b/TODO
index 81c02c59672c0219423fd9f654a8e3fad11c09b7..6472b1a09380c7b98e2666b3c18307c9351d9771 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,10 @@
 
 BUGS INTRODUCED:
 
-[ ] Font size has been changed somehow
-[ ] No cursor on readonly
-[ ] Window resizing broken
\ No newline at end of file
+[ ] Cursor on readonly
+[ ] Window resizing broken
+    Used to redraw on click, now redraws on scroll or drag?
+
+BUGS SQUASHED:
+
+[x] Font size has been changed somehow
\ No newline at end of file
diff --git a/src/lib.rs b/src/lib.rs
index fa35403eca6d5fdbddc8e28cc86165be3b6133a8..b8c9257bfbc31062076e0c429349bcb5afe564d9 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -71,10 +71,13 @@ impl Default for CosmicEditor {
 
 /// Adds the font system to each editor when added
 fn cosmic_editor_builder(
-    mut added_editors: Query<(&mut CosmicEditor, &CosmicAttrs), Added<CosmicEditor>>,
+    mut added_editors: Query<
+        (&mut CosmicEditor, &CosmicAttrs, &CosmicMetrics),
+        Added<CosmicEditor>,
+    >,
     mut font_system: ResMut<CosmicFontSystem>,
 ) {
-    for (mut editor, attrs) in added_editors.iter_mut() {
+    for (mut editor, attrs, metrics) in added_editors.iter_mut() {
         // keep old text if set
         let mut text = get_cosmic_text(editor.0.buffer());
 
@@ -89,6 +92,11 @@ fn cosmic_editor_builder(
             Shaping::Advanced,
         );
 
+        editor.0.buffer_mut().set_metrics(
+            &mut font_system.0,
+            Metrics::new(metrics.font_size, metrics.line_height).scale(metrics.scale_factor),
+        );
+
         editor
             .0
             .buffer_mut() // TODO size here????